diff --git a/js/.directory b/js/.directory
new file mode 100644
index 00000000000..3ccf79f15c4
--- /dev/null
+++ b/js/.directory
@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2011,9,20,11,27,25
+ViewMode=1
diff --git a/js/jquery.mobile.listview.filter.js b/js/jquery.mobile.listview.filter.js
index ebbcc2bdad4..37b24ad5b32 100644
--- a/js/jquery.mobile.listview.filter.js
+++ b/js/jquery.mobile.listview.filter.js
@@ -38,10 +38,16 @@ $( ":jqmData(role='listview')" ).live( "listviewcreate", function() {
 				val = this.value.toLowerCase(),
 				listItems = null,
 				lastval = $this.jqmData( "lastval" ) + "",
-				childItems = false,
+				levels = [],
+				level = null,
 				itemtext = "",
-				item, change;
+				levelCount = 0,
+				item;
+			
+			// Get level count for list dividers 
+			$("li:jqmData(role=list-divider)").each(function() {levelCount = $(this).attr('data-divider-level') > levelCount ? $(this).attr('data-divider-level') : levelCount;	});
 
+			
 			// Change val as lastval for next execution
 			$this.jqmData( "lastval" , val );
 
@@ -67,20 +73,27 @@ $( ":jqmData(role='listview')" ).live( "listviewcreate", function() {
 					itemtext = item.jqmData( "filtertext" ) || item.text();
 
 					if ( item.is( "li:jqmData(role=list-divider)" ) ) {
+						level = item.attr('data-divider-level');
 
-						item.toggleClass( "ui-filter-hidequeue" , !childItems );
+						item.toggleClass( "ui-filter-hidequeue" , !levels[level] );
 
+						if(level > 1){
+							for (var j = level; j>1; j-- ){
+								levels[j] = true;
+							}
+						}
 						// New bucket!
-						childItems = false;
+						levels[level] = false;
+					
+					} else if ( itemtext.toLowerCase().indexOf( val ) === -1 ) {
 
-					} else if ( listview.options.filterCallback( itemtext, val ) ) {
-
-						//mark to be hidden
+						// Mark to be hidden
 						item.toggleClass( "ui-filter-hidequeue" , true );
 					} else {
-
 						// There"s a shown item in the bucket
-						childItems = true;
+						for (var j = levelCount; j>0; j-- ){
+								levels[j] = true;
+						}
 					}
 				}