diff --git a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
index 2629dd11f..84d1caca6 100644
--- a/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/SortSelectionActivity.java
@@ -19,6 +19,7 @@ import com.todoroo.astrid.core.SortHelper;
 
 import org.tasks.R;
 import org.tasks.preferences.ActivityPreferences;
+import org.tasks.preferences.Preferences;
 
 import static com.todoroo.andlib.utility.AndroidUtilities.atLeastHoneycomb;
 
@@ -47,12 +48,6 @@ public class SortSelectionActivity {
         if((flags & SortHelper.FLAG_REVERSE_SORT) > 0) {
             ((CheckBox) body.findViewById(R.id.reverse)).setChecked(true);
         }
-        if((flags & SortHelper.FLAG_SHOW_COMPLETED) > 0) {
-            ((CheckBox) body.findViewById(R.id.completed)).setChecked(true);
-        }
-        if((flags & SortHelper.FLAG_SHOW_HIDDEN) > 0) {
-            ((CheckBox) body.findViewById(R.id.hidden)).setChecked(true);
-        }
 
         if(!showDragDrop) {
             body.findViewById(R.id.sort_drag).setVisibility(View.GONE);
@@ -126,12 +121,6 @@ public class SortSelectionActivity {
             if(((CheckBox)body.findViewById(R.id.reverse)).isChecked()) {
                 flags |= SortHelper.FLAG_REVERSE_SORT;
             }
-            if(((CheckBox)body.findViewById(R.id.completed)).isChecked()) {
-                flags |= SortHelper.FLAG_SHOW_COMPLETED;
-            }
-            if(((CheckBox)body.findViewById(R.id.hidden)).isChecked()) {
-                flags |= SortHelper.FLAG_SHOW_HIDDEN;
-            }
             if(((RadioButton)body.findViewById(R.id.sort_drag)).isChecked()) {
                 flags |= SortHelper.FLAG_DRAG_DROP;
             }
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
index 00e274d23..9b8fdf2f6 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java
@@ -153,9 +153,19 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.task_list_activity, menu);
         TaskListFragment tlf = getTaskListFragment();
+        MenuItem hidden = menu.findItem(R.id.menu_show_hidden);
+        if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) {
+            hidden.setChecked(true);
+        }
+        MenuItem completed = menu.findItem(R.id.menu_show_completed);
+        if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) {
+            completed.setChecked(true);
+        }
         if (tlf instanceof GtasksListFragment) {
             menu.findItem(R.id.menu_clear_completed).setVisible(true);
             menu.findItem(R.id.menu_sort).setVisible(false);
+            hidden.setVisible(false);
+            completed.setVisible(false);
         } else if(tlf instanceof TagViewFragment) {
             menu.findItem(R.id.menu_tag_settings).setVisible(true);
         } else if(tlf.getFilter() instanceof CustomFilter && ((CustomFilter) tlf.getFilter()).getId() > 0) {
@@ -443,7 +453,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
                 return true;
             case R.id.menu_sort:
                 AlertDialog dialog = SortSelectionActivity.createDialog(
-                        this, tlf.hasDraggableOption(), preferences, tlf, tlf.getSortFlags(), preferences.getSortMode());
+                        this, tlf.hasDraggableOption(), preferences, tlf, preferences.getSortFlags(), preferences.getSortMode());
                 dialog.show();
                 return true;
             case R.id.menu_tag_settings:
@@ -451,6 +461,16 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList
                     putExtra(TagViewFragment.EXTRA_TAG_DATA, getTaskListFragment().getActiveTagData());
                 }}, REQUEST_EDIT_TAG);
                 return true;
+            case R.id.menu_show_hidden:
+                item.setChecked(!item.isChecked());
+                preferences.setBoolean(R.string.p_show_hidden_tasks, item.isChecked());
+                tlf.reconstructCursor();
+                return true;
+            case R.id.menu_show_completed:
+                item.setChecked(!item.isChecked());
+                preferences.setBoolean(R.string.p_show_completed_tasks, item.isChecked());
+                tlf.reconstructCursor();
+                return true;
             case R.id.menu_filter_settings:
                 startActivityForResult(new Intent(this, FilterSettingsActivity.class) {{
                     putExtra(FilterSettingsActivity.TOKEN_FILTER, tlf.getFilter());
diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index c5f3ead74..bcce16a80 100644
--- a/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -688,8 +688,9 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
                 + Join.left(TaskAttachment.TABLE.as(FILE_METADATA_JOIN), Task.UUID.eq(Field.field(FILE_METADATA_JOIN + "." + TaskAttachment.TASK_UUID.name)))
                 + filter.getSqlQuery();
 
+        int sortFlags = SortHelper.setManualSort(preferences.getSortFlags(), isDraggable());
         sqlQueryTemplate.set(SortHelper.adjustQueryForFlagsAndSort(
-                preferences, joinedQuery, getSortFlags(), preferences.getSortMode()));
+                preferences, joinedQuery, sortFlags, preferences.getSortMode()));
 
         String groupedQuery;
         if (sqlQueryTemplate.get().contains("GROUP BY")) {
@@ -894,13 +895,9 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
         return isInbox || isTodayFilter;
     }
 
-    public int getSortFlags() {
-        return SortHelper.setManualSort(preferences.getSortFlags(), isDraggable());
-    }
-
     @Override
     public void onSortSelected(int flags, int sort) {
-        boolean wasManualSort = SortHelper.isManualSort(getSortFlags());
+        boolean wasManualSort = SortHelper.isManualSort(preferences.getSortFlags());
         boolean manualSettingChanged = wasManualSort != SortHelper.isManualSort(flags);
 
         preferences.setSortFlags(flags);
diff --git a/src/main/java/com/todoroo/astrid/core/SortHelper.java b/src/main/java/com/todoroo/astrid/core/SortHelper.java
index cb7270220..52dc8e8b1 100644
--- a/src/main/java/com/todoroo/astrid/core/SortHelper.java
+++ b/src/main/java/com/todoroo/astrid/core/SortHelper.java
@@ -24,12 +24,21 @@ import org.tasks.preferences.Preferences;
 public class SortHelper {
 
     public static final int FLAG_REVERSE_SORT = 1;
+
+    @SuppressWarnings("UnusedDeclaration")
+    @Deprecated
     public static final int FLAG_SHOW_COMPLETED = 1 << 1;
+
+    @SuppressWarnings("UnusedDeclaration")
+    @Deprecated
     public static final int FLAG_SHOW_HIDDEN = 1 << 2;
+
     @SuppressWarnings("UnusedDeclaration")
     @Deprecated
     public static final int FLAG_SHOW_DELETED = 1 << 3;
+
     public static final int FLAG_DRAG_DROP = 1 << 4;
+
     @SuppressWarnings("UnusedDeclaration")
     @Deprecated
     private static final int FLAG_SHOW_RECENTLY_COMPLETED = 1 << 5;
@@ -59,14 +68,14 @@ public class SortHelper {
         }
 
         // flags
-        if((flags & FLAG_SHOW_COMPLETED) > 0) {
+        if (preferences.getBoolean(R.string.p_show_completed_tasks, false)) {
             originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(),
                     Criterion.all.toString());
         } else {
             originalSql = originalSql.replace(Task.COMPLETION_DATE.eq(0).toString(),
                     Criterion.or(Task.COMPLETION_DATE.lte(0), Task.COMPLETION_DATE.gt(DateUtilities.now() - 60000)).toString());
         }
-        if((flags & FLAG_SHOW_HIDDEN) > 0) {
+        if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) {
             originalSql = originalSql.replace(TaskCriteria.isVisible().toString(),
                     Criterion.all.toString());
         }
diff --git a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java
index 96418b7f3..58845005d 100644
--- a/src/main/java/org/tasks/widget/ScrollableViewsFactory.java
+++ b/src/main/java/org/tasks/widget/ScrollableViewsFactory.java
@@ -1,7 +1,6 @@
 package org.tasks.widget;
 
 import android.annotation.TargetApi;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -13,12 +12,10 @@ import android.widget.RemoteViews;
 import android.widget.RemoteViewsService;
 
 import com.todoroo.andlib.data.TodorooCursor;
-import com.todoroo.astrid.actfm.TagViewFragment;
 import com.todoroo.astrid.activity.TaskEditFragment;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.adapter.TaskAdapter;
 import com.todoroo.astrid.api.Filter;
-import com.todoroo.astrid.api.FilterWithCustomIntent;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.data.Task;
@@ -190,7 +187,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac
     }
 
     private TodorooCursor<Task> getCursor() {
-        String query = getQuery(context);
+        String query = getQuery();
         return taskService.fetchFiltered(query, null, Task.ID, Task.TITLE, Task.DUE_DATE, Task.COMPLETION_DATE, Task.IMPORTANCE, Task.RECURRENCE);
     }
 
@@ -199,11 +196,7 @@ public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFac
         return new Task(cursor);
     }
 
-    private String getQuery(Context context) {
-        if (filter.isTagFilter()) {
-            ((FilterWithCustomIntent) filter).customTaskList = new ComponentName(context, TagViewFragment.class); // In case legacy widget was created with subtasks fragment
-        }
-
+    private String getQuery() {
         int flags = preferences.getSortFlags();
         int sort = preferences.getSortMode();
         if(sort == 0) {
diff --git a/src/main/res/layout/sort_selection_dialog.xml b/src/main/res/layout/sort_selection_dialog.xml
index 3ebbceee6..88c6a785b 100644
--- a/src/main/res/layout/sort_selection_dialog.xml
+++ b/src/main/res/layout/sort_selection_dialog.xml
@@ -58,33 +58,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="@string/SSD_sort_reverse" />
-            
-      <!-- hidden task status -->
-      
-      <View
-          android:id="@+id/TEA_Separator"
-          android:background="?android:attr/listDivider"
-          android:layout_width="fill_parent"
-          android:layout_height="1px" />
 
-      <TextView
-          style="@style/TextAppearance"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:paddingTop="10dip"
-          android:paddingLeft="10dip"
-          android:text="@string/SSD_hidden_title" />
-        
-      <CheckBox android:id="@+id/hidden"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_hidden" />
-      
-      <CheckBox android:id="@+id/completed"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/SSD_completed" />
-        
     </LinearLayout>
 
 </ScrollView>
diff --git a/src/main/res/menu/task_list_activity.xml b/src/main/res/menu/task_list_activity.xml
index 4ba57814c..b66edf07e 100644
--- a/src/main/res/menu/task_list_activity.xml
+++ b/src/main/res/menu/task_list_activity.xml
@@ -19,6 +19,17 @@
         android:title="@string/TLA_menu_sort"
         android:icon="@drawable/ic_sort_white_24dp"
         app:showAsAction="ifRoom" />
+    <group
+        android:checkableBehavior="all">
+        <item
+            android:id="@+id/menu_show_hidden"
+            android:title="@string/show_hidden"
+            android:checkable="true"/>
+        <item
+            android:id="@+id/menu_show_completed"
+            android:title="@string/show_completed"
+            android:checkable="true" />
+    </group>
     <item
         android:id="@+id/menu_clear_completed"
         android:title="@string/gtasks_GTA_clear_completed"
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 4f85c6227..8778e78cf 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -33,9 +33,6 @@
 	<string name="TAd_contextCopyTask">نسخ المهمه</string>
 	<string name="TAd_contextDeleteTask">حذف المهمة</string>
 	<string name="TAd_contextUndeleteTask">الغاء حذف المهمة</string>
-	<string name="SSD_hidden_title">المهمات المخفية</string>
-	<string name="SSD_completed">عرض المهام المنجزه</string>
-	<string name="SSD_hidden">عرض المهام المخفيه</string>
 	<string name="SSD_deleted">عرض المهام المحذوفة</string>
 	<string name="SSD_sort_auto">الترتيب الذكي</string>
 	<string name="SSD_sort_alpha">بالعنوان</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 92da3aca2..f5deee12c 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -47,9 +47,6 @@
 	<string name="TAd_contextDeleteTask">Изтрий задача</string>
 	<string name="TAd_contextUndeleteTask">Възстанови Задача</string>
 	<string name="TAd_contextPurgeTask">Изчистване на задачите</string>
-	<string name="SSD_hidden_title">Скрити задачи</string>
-	<string name="SSD_completed">Покажи завършени задачи</string>
-	<string name="SSD_hidden">Покажи скрити задачи</string>
 	<string name="SSD_deleted">Покажи изтрити задачи</string>
 	<string name="SSD_sort_drag">Ръчно подреждане с подзадачи</string>
 	<string name="SSD_sort_auto">Умно сортиране</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index c80d74450..08f3b2b75 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -42,9 +42,6 @@
 	<string name="TAd_contextDeleteTask">Suprimeix la tasca</string>
 	<string name="TAd_contextUndeleteTask">Recupera la tasca</string>
 	<string name="TAd_contextPurgeTask">Purgar tasques</string>
-	<string name="SSD_hidden_title">Tasques ocultes</string>
-	<string name="SSD_completed">Mostra les tasques completades</string>
-	<string name="SSD_hidden">Mostra les tasques ocultes</string>
 	<string name="SSD_deleted">Mostra les tasques suprimides</string>
 	<string name="SSD_sort_drag">Ordre manual amb subtasques</string>
 	<string name="SSD_sort_auto">Classificació intel·ligent Tasks</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index cb6560388..b8b5303a1 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Smazat úkol</string>
 	<string name="TAd_contextUndeleteTask">Obnovit úkol</string>
 	<string name="TAd_contextPurgeTask">Smazat úkol</string>
-	<string name="SSD_hidden_title">Skryté úkoly</string>
-	<string name="SSD_completed">Ukázat dokončené úkoly</string>
-	<string name="SSD_hidden">Ukázat skryté úkoly</string>
 	<string name="SSD_deleted">Ukázat smazané úkoly</string>
 	<string name="SSD_sort_drag">Ručně nebo s podúkoly</string>
 	<string name="SSD_sort_auto">Chytré třídění</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 859af3dbc..2c98f30eb 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -38,9 +38,6 @@
 	<string name="TAd_actionEditTask">Rediger</string>
 	<string name="TAd_contextUndeleteTask">Gendan opgave</string>
 	<string name="TAd_contextPurgeTask">Ryd opgave</string>
-	<string name="SSD_hidden_title">Skjulte opgaver</string>
-	<string name="SSD_completed">Vis færdiggjorte opgaver</string>
-	<string name="SSD_hidden">Vis skjulte opgaver</string>
 	<string name="SSD_deleted">Vis slettede opgaver</string>
 	<string name="SSD_sort_drag">Manuel ordre med delopgaver</string>
 	<string name="SSD_sort_auto">Tasks Intelligent sortering</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index bed712e6b..35f677db7 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -43,9 +43,6 @@
 	<string name="TAd_contextDeleteTask">Aufgabe löschen</string>
 	<string name="TAd_contextUndeleteTask">Aufgabe wiederherstellen</string>
 	<string name="TAd_contextPurgeTask">Aufgabe endgültig löschen</string>
-	<string name="SSD_hidden_title">Versteckte Aufgaben</string>
-	<string name="SSD_completed">Erledigte Aufgaben anzeigen</string>
-	<string name="SSD_hidden">Versteckte Aufgaben anzeigen</string>
 	<string name="SSD_deleted">Gelöschte Aufgaben anzeigen</string>
 	<string name="SSD_sort_drag">Manuelle Sortierung mit Unteraufgaben</string>
 	<string name="SSD_sort_auto">Smarte Sortierung</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 03e2e63fc..1908da2fc 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -42,9 +42,6 @@
 	<string name="TAd_deletedFormat">%s [διαγράφηκε]</string>
 	<string name="TAd_actionEditTask">Επεξεργασία</string>
 	<string name="TAd_contextCopyTask">Αντιγραφή εργασίας</string>
-	<string name="SSD_hidden_title">Κρυμμένα καθήκοντα</string>
-	<string name="SSD_completed">Εμφάνιση ολοκληρωμένων καθηκόντων</string>
-	<string name="SSD_hidden">Εμφάνιση κρυμμένων καθηκόντων</string>
 	<string name="SSD_deleted">Εμφάνιση διεγραμμένων καθηκόντων</string>
 	<string name="SSD_sort_drag">Χειροκίνητη κατάταξη με υποκαθήκοντα</string>
 	<string name="SSD_sort_auto">Έξυπνη ταξινόμηση</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 9b0aa10d1..11b96fb5d 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Eliminar tarea</string>
 	<string name="TAd_contextUndeleteTask">Restaurar Tarea</string>
 	<string name="TAd_contextPurgeTask">Purgar Tareas</string>
-	<string name="SSD_hidden_title">Tareas Ocultas</string>
-	<string name="SSD_completed">Mostrar tareas completadas</string>
-	<string name="SSD_hidden">Mostrar tareas ocultas</string>
 	<string name="SSD_deleted">Mostrar tareas eliminadas</string>
 	<string name="SSD_sort_drag">Orden manual con subtareas</string>
 	<string name="SSD_sort_auto">Ordenación inteligente</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 33e43eea0..b5f6d5932 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -6,9 +6,6 @@
 <!-- ************************************************************** -->
 <resources>
 	<string name="actfm_GAA_title">Valitse mitä Google tiliä haluat käyttää:</string>
-	<string name="SSD_hidden_title">Piilota tehtävät</string>
-	<string name="SSD_completed">Näytä valmiit tehtävät</string>
-	<string name="SSD_hidden">Näytä piilotetut tehtävät</string>
 	<string name="SSD_deleted">Näytä poistetut tehtävät</string>
 	<string name="SSD_sort_drag">Manuaalinen järjestys osatehtäviin</string>
 	<string name="SSD_sort_auto">Älykäs sorttaus</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 6d8d8db2d..528ff3f98 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Supprimer la tâche</string>
 	<string name="TAd_contextUndeleteTask">Récupérer la tâche</string>
 	<string name="TAd_contextPurgeTask">Purger la tâche</string>
-	<string name="SSD_hidden_title">Tâches masquées</string>
-	<string name="SSD_completed">Afficher les tâches complétées</string>
-	<string name="SSD_hidden">Afficher les tâches cachées</string>
 	<string name="SSD_deleted">Afficher les tâches supprimées</string>
 	<string name="SSD_sort_drag">Ordonner manuellement avec les sous-tâches</string>
 	<string name="SSD_sort_auto">Tri intelligent Tasks</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 87a253cd5..c3874b666 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -43,9 +43,6 @@
 	<string name="TAd_contextDeleteTask">Elimina attività</string>
 	<string name="TAd_contextUndeleteTask">Ripristina Attività</string>
 	<string name="TAd_contextPurgeTask">Elimina Attività</string>
-	<string name="SSD_hidden_title">Attività Nascoste</string>
-	<string name="SSD_completed">Mostra Attività Collegate</string>
-	<string name="SSD_hidden">Mostra Attività Nascoste</string>
 	<string name="SSD_deleted">Mostra Attività Cancellate</string>
 	<string name="SSD_sort_auto">Ordinamento Intelligente</string>
 	<string name="SSD_sort_alpha">Per Titotlo</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 9caa5e9ec..edc208d77 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">מַחֲקֵי משימה</string>
 	<string name="TAd_contextUndeleteTask">בטלי מחיקת משימה</string>
 	<string name="TAd_contextPurgeTask">אַיֵּן משימה</string>
-	<string name="SSD_hidden_title">משימות מוסתרות</string>
-	<string name="SSD_completed">הצג משימות שבוצעו</string>
-	<string name="SSD_hidden">הצג משימות מוסתרות</string>
 	<string name="SSD_deleted">הצג משימות שנמחקו</string>
 	<string name="SSD_sort_drag">סידור ידני עם תתי-משימות</string>
 	<string name="SSD_sort_auto">Tasks מיון חכם</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index d993c8aa0..6d18ee9d2 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">タスクを削除</string>
 	<string name="TAd_contextUndeleteTask">元に戻す</string>
 	<string name="TAd_contextPurgeTask">タスクを削除</string>
-	<string name="SSD_hidden_title">非表示のタスク</string>
-	<string name="SSD_completed">完了タスクの表示</string>
-	<string name="SSD_hidden">非表示タスクの表示</string>
 	<string name="SSD_deleted">削除済タスクの表示</string>
 	<string name="SSD_sort_drag">サブタスクの手動設定順</string>
 	<string name="SSD_sort_auto">自動</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index d16b9dcc2..c8ec506ea 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -47,9 +47,6 @@
 	<string name="TAd_contextDeleteTask">일정 지우기</string>
 	<string name="TAd_contextUndeleteTask">일정 복구하기</string>
 	<string name="TAd_contextPurgeTask">일정 비우기</string>
-	<string name="SSD_hidden_title">숨긴 일정</string>
-	<string name="SSD_completed">완료한 일정 보기</string>
-	<string name="SSD_hidden">숨긴 일정 보기</string>
 	<string name="SSD_deleted">지운 일정 보기</string>
 	<string name="SSD_sort_drag">수동 정렬 (하위일정 포함)</string>
 	<string name="SSD_sort_auto">Tasks 스마트 정렬</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index a33e26593..ad22b3f0e 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -35,9 +35,6 @@
 	<string name="TAd_contextDeleteTask">Slett oppgave</string>
 	<string name="TAd_contextUndeleteTask">Gjenopprett slettet oppgave</string>
 	<string name="TAd_contextPurgeTask">Rens ut oppgave</string>
-	<string name="SSD_hidden_title">Skjulte oppgaver</string>
-	<string name="SSD_completed">Vis fullførte oppgaver</string>
-	<string name="SSD_hidden">Vis skjulte oppgaver</string>
 	<string name="SSD_deleted">Vis slettede oppgaver</string>
 	<string name="SSD_sort_auto">Tasks intelligent sortering</string>
 	<string name="SSD_sort_alpha">Etter tittel</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 5ff76fec7..8d6d0cfd5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Taak wissen</string>
 	<string name="TAd_contextUndeleteTask">Taak herstellen</string>
 	<string name="TAd_contextPurgeTask">Taak opruimen</string>
-	<string name="SSD_hidden_title">Verborgen Taken</string>
-	<string name="SSD_completed">Voltooide taken weergeven</string>
-	<string name="SSD_hidden">Verborgen taken weergeven</string>
 	<string name="SSD_deleted">Verwijderde taken weergeven</string>
 	<string name="SSD_sort_drag">Handmatige volgorde met subtaken</string>
 	<string name="SSD_sort_auto">Slim Sorteren</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3514abcf9..37f8e99f6 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Usuń zadanie</string>
 	<string name="TAd_contextUndeleteTask">Przywrócone zadanie</string>
 	<string name="TAd_contextPurgeTask">Trwale usuń zadanie</string>
-	<string name="SSD_hidden_title">Ukryte zadania</string>
-	<string name="SSD_completed">Pokaż ukończone zadania</string>
-	<string name="SSD_hidden">Pokaż ukryte zadania</string>
 	<string name="SSD_deleted">Pokaż usunięte zadania</string>
 	<string name="SSD_sort_drag">Ręczne z podzadaniami</string>
 	<string name="SSD_sort_auto">Automatyczne</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 9da151335..81cef58b2 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -43,9 +43,6 @@
 	<string name="TAd_contextDeleteTask">Excluir tarefa</string>
 	<string name="TAd_contextUndeleteTask">Restaurar tarefa</string>
 	<string name="TAd_contextPurgeTask">Destruir tarefa</string>
-	<string name="SSD_hidden_title">Tarefas ocultas</string>
-	<string name="SSD_completed">Exibir tarefas terminadas</string>
-	<string name="SSD_hidden">Exibir tarefas ocultas</string>
 	<string name="SSD_deleted">Exibir tarefas excluídas</string>
 	<string name="SSD_sort_drag">Ordem manual com subtarefas</string>
 	<string name="SSD_sort_auto">Ordenação inteligente Tasks</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index d89e4c9f4..eb079c067 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -46,9 +46,6 @@
 	<string name="TAd_contextDeleteTask">Eliminar tarefa</string>
 	<string name="TAd_contextUndeleteTask">Recuperar tarefa</string>
 	<string name="TAd_contextPurgeTask">Remover tarefa</string>
-	<string name="SSD_hidden_title">Tarefas ocultas</string>
-	<string name="SSD_completed">Mostrar Tarefas Completas</string>
-	<string name="SSD_hidden">Mostrar tarefas ocultas</string>
 	<string name="SSD_deleted">Mostrar tarefas apagadas</string>
 	<string name="SSD_sort_drag">Ordem manual com subtarefas</string>
 	<string name="SSD_sort_auto">Ordenação Inteligente Tasks</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e05825d5d..8d7707387 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Удалить задачу</string>
 	<string name="TAd_contextUndeleteTask">Отменить удаление задачи</string>
 	<string name="TAd_contextPurgeTask">Очистить задачу</string>
-	<string name="SSD_hidden_title">Скрытые задачи</string>
-	<string name="SSD_completed">Показать завершённые задачи</string>
-	<string name="SSD_hidden">Показать скрытые задачи</string>
 	<string name="SSD_deleted">Показать удалённые задачи</string>
 	<string name="SSD_sort_drag">Ручная сортировка с подзадачами</string>
 	<string name="SSD_sort_auto">Умная сортировка</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 1763f9285..c6b90eb23 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Vymazať úlohu</string>
 	<string name="TAd_contextUndeleteTask">Nevymazať úlohu</string>
 	<string name="TAd_contextPurgeTask">Vyčistiť úlohu</string>
-	<string name="SSD_hidden_title">Skryté úlohy</string>
-	<string name="SSD_completed">Zobraziť dokončené úlohy</string>
-	<string name="SSD_hidden">Zobraziť skryté úlohy</string>
 	<string name="SSD_deleted">Zobraziť vymazané úlohy</string>
 	<string name="SSD_sort_drag">Ručne alebo s pdúlohami</string>
 	<string name="SSD_sort_auto">Chytré triedenie</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 43e92e81e..7572431cf 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -47,9 +47,6 @@
 	<string name="TAd_contextDeleteTask">Zbriši opravek</string>
 	<string name="TAd_contextUndeleteTask">Razveljavi izbris opravka</string>
 	<string name="TAd_contextPurgeTask">Očisti opravek</string>
-	<string name="SSD_hidden_title">Skriti opravki</string>
-	<string name="SSD_completed">Prikaži dokončane opravke</string>
-	<string name="SSD_hidden">Prikaži skrite opravke</string>
 	<string name="SSD_deleted">Prikaži zbrisane opravke</string>
 	<string name="SSD_sort_drag">Ročna nastavitev s podopravki</string>
 	<string name="SSD_sort_auto">Pametno razvrščanje</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index bc37d3ff1..ce3e22aa1 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">Radera uppgift</string>
 	<string name="TAd_contextUndeleteTask">Återställ raderad uppgift</string>
 	<string name="TAd_contextPurgeTask">Rensa uppgift</string>
-	<string name="SSD_hidden_title">Dolda uppgifter</string>
-	<string name="SSD_completed">Visa avslutade uppgifter</string>
-	<string name="SSD_hidden">Visa dolda uppgifter</string>
 	<string name="SSD_deleted">Visa raderade uppgifter</string>
 	<string name="SSD_sort_drag">Manuell sortering med underuppgifter</string>
 	<string name="SSD_sort_auto">Tasks intelligent sortering</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 9aedbbb57..29e246602 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -23,8 +23,6 @@
 	<string name="TLA_menu_sort">Sort &amp; Hidden</string>
 	<string name="TAd_actionEditTask">แก้ไข</string>
 	<string name="TAd_contextUndeleteTask">แผนงานที่ลบไม่ได้</string>
-	<string name="SSD_completed">แสดงแผนงานที่เสร็จแล้ว</string>
-	<string name="SSD_hidden">แสดงแผนงานที่ซ่อนไว้</string>
 	<string name="SSD_deleted">แสดงแผนงานที่ถูกลบ</string>
 	<string name="SSD_sort_auto">จัดเรียงด้วย Tasks Smart</string>
 	<string name="SSD_sort_alpha">ตามชื่อ</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 6312a62d0..9f0e35e71 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -43,9 +43,6 @@
 	<string name="TAd_contextDeleteTask">Görevi Sil</string>
 	<string name="TAd_contextUndeleteTask">Görevi Kurtar</string>
 	<string name="TAd_contextPurgeTask">Görevi Temizle</string>
-	<string name="SSD_hidden_title">Gizli Görevler</string>
-	<string name="SSD_completed">Tamamlanan Görevleri Göster</string>
-	<string name="SSD_hidden">Gizli Görevleri Göster</string>
 	<string name="SSD_deleted">Silinmiş Görevleri Göster</string>
 	<string name="SSD_sort_auto">Tasks Akıllı Sıralama</string>
 	<string name="SSD_sort_alpha">Başlığa göre</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 8034c187f..7d713c532 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -47,9 +47,6 @@
 	<string name="TAd_contextDeleteTask">Видалити завдання</string>
 	<string name="TAd_contextUndeleteTask">Відмінити видалення завдання</string>
 	<string name="TAd_contextPurgeTask">Очитстити завдання</string>
-	<string name="SSD_hidden_title">Приховані завдання</string>
-	<string name="SSD_completed">Показати завершені завдання</string>
-	<string name="SSD_hidden">Показати приховані завдання</string>
 	<string name="SSD_deleted">Показати видалені завдання</string>
 	<string name="SSD_sort_drag">Ручний порядок з підзадачами</string>
 	<string name="SSD_sort_auto">Розумне сортування</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e8df7cfdb..07ffc75c6 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -43,9 +43,6 @@
 	<string name="TAd_contextDeleteTask">删除任务</string>
 	<string name="TAd_contextUndeleteTask">未删除任务</string>
 	<string name="TAd_contextPurgeTask">清除任务</string>
-	<string name="SSD_hidden_title">隐藏任务</string>
-	<string name="SSD_completed">显示已完成任务</string>
-	<string name="SSD_hidden">显示隐藏的任务</string>
 	<string name="SSD_deleted">显示已删除任务</string>
 	<string name="SSD_sort_auto">清单小助理智能排序</string>
 	<string name="SSD_sort_alpha">按标题</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 1c1054b80..2158cd147 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -44,9 +44,6 @@
 	<string name="TAd_contextDeleteTask">刪除任務工作</string>
 	<string name="TAd_contextUndeleteTask">還原工作刪除</string>
 	<string name="TAd_contextPurgeTask">清除工作</string>
-	<string name="SSD_hidden_title">隱藏任務工作</string>
-	<string name="SSD_completed">顯示已完成工作</string>
-	<string name="SSD_hidden">顯示隱藏的工作</string>
 	<string name="SSD_deleted">顯示已刪除工作</string>
 	<string name="SSD_sort_auto">Tasks智慧排序</string>
 	<string name="SSD_sort_alpha">依主旨</string>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 588d277bb..7170e9553 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -243,6 +243,8 @@
   <string name="p_geofence_responsiveness">geofence_responsiveness</string>
   <string name="p_geofence_reminders_enabled">geofence_reminders_enabled</string>
   <string name="p_show_deleted_tasks">show_deleted_tasks</string>
+  <string name="p_show_hidden_tasks">show_hidden_tasks</string>
+  <string name="p_show_completed_tasks">show_completed_tasks</string>
 
   <string-array name="TEA_control_sets_prefs">
         <item>@string/TEA_ctrl_when_pref</item>
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index f3236d144..9b89efbac 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -77,16 +77,7 @@
   
   <!-- ============================================== SortSelectionDialog == -->
   
-  <!-- slide 23h:  Hidden: title -->
-  <string name="SSD_hidden_title">Hidden Tasks</string>
-  
-  <!-- Hidden Task Selection: show completed tasks -->    
-  <string name="SSD_completed">Show completed tasks</string>
-  
-  <!-- Hidden Task Selection: show hidden tasks -->    
-  <string name="SSD_hidden">Show hidden tasks</string>
-  
-  <!-- Hidden Task Selection: show deleted tasks -->    
+  <!-- Hidden Task Selection: show deleted tasks -->
   <string name="SSD_deleted">Show deleted tasks</string>
   
   <!-- Sort Selection: drag with subtasks -->
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 7a76bfec6..7cc09aaa3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -121,6 +121,8 @@
     <string name="delete">Delete</string>
     <string name="filter_settings">Filter Settings</string>
     <string name="deprecated_setting">This setting will be removed in a future update</string>
+    <string name="show_hidden">Show hidden</string>
+    <string name="show_completed">Show completed</string>
 
     <string-array name="sync_SPr_interval_entries">
         <!-- sync_SPr_interval_entries: Synchronization Intervals -->