diff --git a/build.gradle b/build.gradle
index 3eecf8d7d..8606f6b41 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,8 @@ android {
 
     defaultConfig {
         applicationId "org.tasks"
-        versionCode 411
-        versionName "4.8.18"
+        versionCode 412
+        versionName "4.8.19"
         minSdkVersion 14
         targetSdkVersion 24
         multiDexEnabled true
diff --git a/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java b/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
index 20fd56302..0914e1aaf 100644
--- a/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
+++ b/src/googleplay/java/org/tasks/ui/GoogleTaskListFragment.java
@@ -50,8 +50,8 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
     @Inject Tracker tracker;
 
     private long taskId;
-    private GtasksList originalList;
-    private GtasksList selectedList;
+    @Nullable private GtasksList originalList;
+    @Nullable private GtasksList selectedList;
 
     @Nullable
     @Override
@@ -59,8 +59,15 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
         View view = super.onCreateView(inflater, container, savedInstanceState);
         if (savedInstanceState != null) {
             taskId = savedInstanceState.getLong(EXTRA_TASK_ID);
-            originalList = new GtasksList((StoreObject) savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST));
-            selectedList = new GtasksList((StoreObject) savedInstanceState.getParcelable(EXTRA_SELECTED_LIST));
+
+            StoreObject originalStoreObject = savedInstanceState.getParcelable(EXTRA_ORIGINAL_LIST);
+            if (originalStoreObject != null) {
+                originalList = new GtasksList(originalStoreObject);
+            }
+            StoreObject selectedStoreObject = savedInstanceState.getParcelable(EXTRA_SELECTED_LIST);
+            if (selectedStoreObject != null) {
+                selectedList = new GtasksList(selectedStoreObject);
+            }
         } else {
             Metadata metadata = gtasksMetadataService.getActiveTaskMetadata(taskId);
             if (metadata != null) {
@@ -81,8 +88,12 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
         super.onSaveInstanceState(outState);
 
         outState.putLong(EXTRA_TASK_ID, taskId);
-        outState.putParcelable(EXTRA_ORIGINAL_LIST, originalList.getStoreObject());
-        outState.putParcelable(EXTRA_SELECTED_LIST, selectedList.getStoreObject());
+        if (originalList != null) {
+            outState.putParcelable(EXTRA_ORIGINAL_LIST, originalList.getStoreObject());
+        }
+        if (selectedList != null) {
+            outState.putParcelable(EXTRA_SELECTED_LIST, selectedList.getStoreObject());
+        }
     }
 
     @Override
@@ -137,7 +148,7 @@ public class GoogleTaskListFragment extends TaskEditControlFragment {
 
     @Override
     public boolean hasChanges(Task original) {
-        return !selectedList.equals(originalList);
+        return selectedList != null && !selectedList.equals(originalList);
     }
 
     @Override
diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 6a1264fe5..e09454e30 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -353,7 +353,7 @@ public class CustomFilterActivity extends ThemedInjectingAppCompatActivity {
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.tag_settings_activity, menu);
+        getMenuInflater().inflate(R.menu.menu_custom_filter_activity, menu);
         MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white));
         menu.findItem(R.id.delete).setVisible(false);
         return super.onCreateOptionsMenu(menu);
diff --git a/src/main/res/menu/menu_custom_filter_activity.xml b/src/main/res/menu/menu_custom_filter_activity.xml
new file mode 100644
index 000000000..5d37d3872
--- /dev/null
+++ b/src/main/res/menu/menu_custom_filter_activity.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_save"
+        android:title="@string/save"
+        android:icon="@drawable/ic_save_24dp"
+        app:showAsAction="always"/>
+
+    <item
+        android:id="@+id/delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_delete_24dp"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file