diff --git a/astrid/common-src/com/todoroo/andlib/sql/Functions.java b/astrid/common-src/com/todoroo/andlib/sql/Functions.java
index ac994dad8..a0ebac26d 100644
--- a/astrid/common-src/com/todoroo/andlib/sql/Functions.java
+++ b/astrid/common-src/com/todoroo/andlib/sql/Functions.java
@@ -12,4 +12,5 @@ public final class Functions {
     private static String value(Object value) {
         return value.toString();
     }
+
 }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index ca0a96c24..080719b34 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -9,6 +9,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
+import android.util.Log;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.sql.QueryTemplate;
@@ -82,6 +83,7 @@ public class TagFilterExposer extends BroadcastReceiver {
                 "Untagged",
                 tagService.untaggedTemplate(),
                 null);
+        Log.e("sdlfk", untagged.sqlQuery);
         untagged.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_untagged)).getBitmap();
         FilterCategory tagsCategoryBySize = new FilterCategory(TagsPlugin.IDENTIFIER,
                 context.getString(R.string.tag_FEx_by_size), filtersBySize);
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index b4d8149bd..b46f9dcbd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -2,8 +2,8 @@ package com.todoroo.astrid.tags;
 
 import java.util.ArrayList;
 
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.CountProperty;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
@@ -11,6 +11,7 @@ import com.todoroo.andlib.sql.Join;
 import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.sql.QueryTemplate;
+import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.astrid.dao.MetadataDao;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
 import com.todoroo.astrid.dao.TaskDao.TaskCriteria;
@@ -79,10 +80,10 @@ public class TagService {
     }
 
     public QueryTemplate untaggedTemplate() {
-        return new QueryTemplate().join(Join.left(Metadata.TABLE,
-                Task.ID.eq(Metadata.TASK))).where(Criterion.and(
-                        TaskCriteria.isActive(), MetadataCriteria.withKey(KEY),
-                        Metadata.VALUE.isNull()));
+        return new QueryTemplate().where(Criterion.and(
+                Criterion.not(Task.ID.in(Query.select(Metadata.TASK).from(Metadata.TABLE).where(MetadataCriteria.withKey(KEY)))),
+                TaskCriteria.isActive(),
+                TaskCriteria.isVisible(DateUtilities.now())));
     }
 
     /**
diff --git a/astrid/res/layout/task_adapter_row.xml b/astrid/res/layout/task_adapter_row.xml
index 4b75fa50c..71ddee4a7 100644
--- a/astrid/res/layout/task_adapter_row.xml
+++ b/astrid/res/layout/task_adapter_row.xml
@@ -6,17 +6,18 @@
     android:focusable="true"
     android:paddingLeft="4dip"
     android:paddingRight="6dip"
-    android:paddingBottom="4px"
-    android:minHeight="60px"
+    android:paddingTop="4dip"
+    android:paddingBottom="4dip"
+    android:minHeight="58dip"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
     
     <!-- completion check-box -->
     <CheckBox android:id="@+id/completeBox"
-        android:layout_width="52px"
+        android:layout_width="52dip"
         android:layout_height="fill_parent"
         android:layout_weight="1"
-        android:paddingLeft="5px" 
+        android:paddingLeft="5dip" 
         android:focusable="false"
         android:button="@drawable/btn_check"/>
 
@@ -24,8 +25,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="100"
-        android:paddingLeft="12px"
-        android:paddingRight="2px"
+        android:paddingLeft="12dip"
+        android:paddingRight="2dip"
 
         android:orientation="vertical">
             
@@ -49,7 +50,7 @@
             
     <!-- importance -->
     <View android:id="@+id/importance"
-        android:layout_width="2px"
+        android:layout_width="2dip"
         android:layout_height="fill_parent"/>
         
 </LinearLayout>
diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/res/layout/task_list_activity.xml
index f0e6c195f..2617f6559 100644
--- a/astrid/res/layout/task_list_activity.xml
+++ b/astrid/res/layout/task_list_activity.xml
@@ -19,8 +19,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:src="@drawable/tango_previous"
-            android:paddingTop="8px"
-            android:paddingLeft="5px"/> 
+            android:paddingTop="8dip"
+            android:paddingLeft="5dip"/> 
         
         <!-- List Label -->
         <TextView android:id="@+id/listLabel"
@@ -28,8 +28,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="100"
             android:singleLine="true"
-            android:paddingTop="6px"
-            android:paddingRight="50px"
+            android:paddingTop="6dip"
+            android:paddingRight="50dip"
             style="@style/TextAppearance.TLA_Header"/>
 
     </LinearLayout>
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 43ee9fc97..028726cd5 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -137,7 +137,7 @@ public class EditPreferences extends PreferenceActivity {
                 database.openForWriting();
                 Task task = new Task();
                 for(int i = 0; i < 100; i++) {
-                    task.setId(Task.NO_ID);
+                    task.clear();
                     task.setValue(Task.TITLE, Integer.toString(i));
                     taskService.save(task, false);
                 }
diff --git a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
index c0a4f3e69..3fa5409e0 100644
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -13,12 +13,11 @@ import android.widget.AbsListView;
 import android.widget.BaseExpandableListAdapter;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.ImageView.ScaleType;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.ImageView.ScaleType;
 
 import com.timsu.astrid.R;
-import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterCategory;
 import com.todoroo.astrid.api.FilterListHeader;
 import com.todoroo.astrid.api.FilterListItem;
@@ -68,7 +67,7 @@ public class FilterAdapter extends BaseExpandableListAdapter {
     public View getChildView(int groupPosition, int childPosition, boolean isLastChild,
             View convertView, ViewGroup parent) {
         FilterListItem item = (FilterListItem)getChild(groupPosition, childPosition);
-        View textView = getStandardView((Filter)item, true);
+        View textView = getStandardView(item, true);
         return textView;
     }