diff --git a/src/org/kreed/vanilla/MediaAdapter.java b/src/org/kreed/vanilla/MediaAdapter.java
index 59cfa950..64c536db 100644
--- a/src/org/kreed/vanilla/MediaAdapter.java
+++ b/src/org/kreed/vanilla/MediaAdapter.java
@@ -112,7 +112,7 @@ public class MediaAdapter extends BaseAdapter implements Filterable {
 	}
 
 	private class ArrayFilter extends Filter {
-		class ArrayFilterResults extends FilterResults {
+		protected class ArrayFilterResults extends FilterResults {
 			public int limiterHash;
 
 			public ArrayFilterResults(List<SongData> list, int limiterHash)
@@ -127,7 +127,7 @@ public class MediaAdapter extends BaseAdapter implements Filterable {
 		protected FilterResults performFiltering(CharSequence filter)
 		{
 			List<SongData> list;
-			int limiterHash = mLimiter == null ? 0 : mLimiter.hashCode();
+			int limiterHash = mLimiter == null ? -1 : mLimiter.hashCode();
 
 			if (filter != null && filter.length() == 0)
 				filter = null;
diff --git a/src/org/kreed/vanilla/SongSelector.java b/src/org/kreed/vanilla/SongSelector.java
index 4fe11db4..cc44855b 100644
--- a/src/org/kreed/vanilla/SongSelector.java
+++ b/src/org/kreed/vanilla/SongSelector.java
@@ -233,10 +233,7 @@ public class SongSelector extends TabActivity implements AdapterView.OnItemClick
 			if (view instanceof TextView) {
 				SongData.Field limiter = getAdapter(mTabHost.getCurrentTab()).getLimiter();
 				int field = data.field - 1;
-				if (limiter.field == 0)
-					limiter = null;
-				else
-					limiter.field = field;
+				limiter = limiter.field == 0 ? null : new SongData.Field(field, limiter.data);
 				for (int i = 3; --i != -1; ) {
 					MediaAdapter adapter = getAdapter(i);
 					SongData.Field currentLimiter = adapter.getLimiter();