diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
index 3fcc8e361..d797cf899 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleEditAlerts.java
@@ -17,6 +17,7 @@ import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
 import com.todoroo.astrid.adapter.FilterAdapter;
 import com.todoroo.astrid.api.Filter;
+import com.todoroo.astrid.api.FilterCategory;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.utility.Constants;
 import com.twofortyfouram.SharedResources;
@@ -146,9 +147,19 @@ public final class LocaleEditAlerts extends ExpandableListActivity {
         adapter = new FilterAdapter(this, getExpandableListView(), R.layout.filter_adapter_row) {
             @Override
             public void onReceiveFilter(FilterListItem item) {
-                if(finalSelection != null && item instanceof Filter &&
-                        finalSelection.equals(((Filter)item).sqlQuery))
-                    adapter.setSelection(item);
+                if(adapter.getSelection() != null || finalSelection == null)
+                    return;
+                if(item instanceof Filter) {
+                    if(finalSelection.equals(((Filter)item).sqlQuery))
+                        adapter.setSelection(item);
+                } else if(item instanceof FilterCategory) {
+                    Filter[] filters = ((FilterCategory)item).children;
+                    for(Filter filter : filters)
+                        if(finalSelection.equals(filter.sqlQuery)) {
+                            adapter.setSelection(filter);
+                            break;
+                        }
+                }
             }
         };
         adapter.filterStyle = R.style.TextAppearance_LEA_Filter;
diff --git a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
index eef364e60..4ec2ed108 100644
--- a/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
+++ b/astrid/plugin-src/com/todoroo/astrid/locale/LocaleReceiver.java
@@ -59,7 +59,7 @@ public class LocaleReceiver extends BroadcastReceiver {
 				String preferenceKey = makePreferenceKey(title, interval);
 				long lastNotifyTime = Preferences.getLong(preferenceKey, 0);
 				if(DateUtilities.now() - lastNotifyTime < interval * 1000L) {
-			        Log.i("astrid-locale", title + ": Too soon, need " + (interval
+			        Log.i("astrid-locale-rx", title + ": Too soon, need " + (interval
 			                - (DateUtilities.now() - lastNotifyTime)/1000) + " more seconds");
 			        return;
 				}
@@ -91,8 +91,7 @@ public class LocaleReceiver extends BroadcastReceiver {
 				}
 	    	}
     	} catch (Exception e) {
-    	    if(Constants.DEBUG)
-    	        Log.i("astrid-locale-rx", "Error receiving intent", e);
+	        Log.i("astrid-locale-rx", "Error receiving intent", e);
     	}
     }
 
diff --git a/astrid/res/layout/number_picker.xml b/astrid/res/layout/number_picker.xml
index 25bf50fb6..62959d131 100644
--- a/astrid/res/layout/number_picker.xml
+++ b/astrid/res/layout/number_picker.xml
@@ -18,7 +18,7 @@
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <com.timsu.astrid.widget.NumberPickerButton android:id="@+id/increment"
+    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/increment"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_up_btn"
@@ -34,7 +34,7 @@
             android:background="@drawable/timepicker_input"
             />
         
-    <com.timsu.astrid.widget.NumberPickerButton android:id="@+id/decrement"
+    <com.todoroo.astrid.ui.NumberPickerButton android:id="@+id/decrement"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/timepicker_down_btn"
diff --git a/astrid/res/layout/number_picker_dialog.xml b/astrid/res/layout/number_picker_dialog.xml
index b0411a521..7e66b3e75 100644
--- a/astrid/res/layout/number_picker_dialog.xml
+++ b/astrid/res/layout/number_picker_dialog.xml
@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="5dip">
-    <com.timsu.astrid.widget.NumberPicker android:id="@+id/numberPicker"
+    <com.todoroo.astrid.ui.NumberPicker android:id="@+id/numberPicker"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"/>
 </FrameLayout>