diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
index 0d075dd0d..b0eea1a79 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
@@ -132,7 +132,7 @@ public class CustomFilterAdapter extends ArrayAdapter<CriterionInstance> {
             frameLayout.addView(editText, new FrameLayout.LayoutParams(
                     FrameLayout.LayoutParams.FILL_PARENT,
                     FrameLayout.LayoutParams.WRAP_CONTENT));
-            dialog.setMessage(textInCriterion.prompt).setView(frameLayout).
+            dialog.setView(frameLayout).
                 setPositiveButton(android.R.string.ok, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int which) {
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 5d6efab77..b716d5457 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -132,7 +132,6 @@
 		<item>الإسبوع القادم</item>
 		<item>الشهر القادم</item>
 	</string-array>
-	<string name="CFC_tag_name">قائمة...</string>
 	<string name="CFC_title_contains_name">العنوان يحتوي على..</string>
 	<string name="gcal_TEA_nocal">لا تضيف</string>
 	<string name="gtasks_GTA_clearing">حذف المهام المنتهية...</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index ab7e41c9e..3f83bd534 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -213,10 +213,6 @@
 	</string-array>
 	<string name="CFC_importance_text">С приоритет поне ?</string>
 	<string name="CFC_importance_name">Приоритет</string>
-	<string name="CFC_tag_text">Списък: ?</string>
-	<string name="CFC_tag_name">Списък...</string>
-	<string name="CFC_tag_contains_name">Името на списъка съдържа ...</string>
-	<string name="CFC_tag_contains_text">Покажи имена съдържащи: ?</string>
 	<string name="CFC_title_contains_name">Имена съдържащи...</string>
 	<string name="CFC_title_contains_text">Името съдържа: ?</string>
 	<string name="gcal_TEA_error">Грешка при добавяне на задачата към каледнара!</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 4372ea665..47f97bbe2 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -126,8 +126,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Per menys important?</string>
 	<string name="CFC_importance_name">Importància...</string>
-	<string name="CFC_tag_text">Enumerar: ?</string>
-	<string name="CFC_tag_name">Llista...</string>
 	<string name="CFC_title_contains_name">El títol conté...</string>
 	<string name="CFC_title_contains_text">Títol conté: ?</string>
 	<string name="gcal_TEA_error">Error afegint la tasca al calendari!</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 5837f6347..6878aeeb4 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -195,10 +195,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Alespoň důležitost?</string>
 	<string name="CFC_importance_name">Důležitost...</string>
-	<string name="CFC_tag_text">Seznam: ?</string>
-	<string name="CFC_tag_name">Seznam...</string>
-	<string name="CFC_tag_contains_name">Jméno seznamu obsahuje...</string>
-	<string name="CFC_tag_contains_text">Jméno seznamu obsahuje: ?</string>
 	<string name="CFC_title_contains_name">Název obsahuje...</string>
 	<string name="CFC_title_contains_text">Obsahuje název: ?</string>
 	<string name="gcal_TEA_error">Chyba při přidávání úkolu do kalendáře!</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 29fb71cd7..d287e6c17 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -108,10 +108,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Vigtighed mindst ?</string>
 	<string name="CFC_importance_name">Vigtighed...</string>
-	<string name="CFC_tag_text">Liste: ?</string>
-	<string name="CFC_tag_name">Liste...</string>
-	<string name="CFC_tag_contains_name">Listenavn indeholder...</string>
-	<string name="CFC_tag_contains_text">Listenavnet indeholder: ?</string>
 	<string name="CFC_title_contains_name">Titel indeholder...</string>
 	<string name="CFC_title_contains_text">Titel indeholder: ?</string>
 	<string name="gcal_TEA_error">Fejl ved tilføjelse af opgave til kalender!</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index aed7bfccc..5fef4adc6 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -206,10 +206,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Mindestpriorität ?</string>
 	<string name="CFC_importance_name">Priorität...</string>
-	<string name="CFC_tag_text">Liste: ?</string>
-	<string name="CFC_tag_name">Liste …</string>
-	<string name="CFC_tag_contains_name">Listenname enthält …</string>
-	<string name="CFC_tag_contains_text">Listenname enthält: ?</string>
 	<string name="CFC_title_contains_name">Titel enthält …</string>
 	<string name="CFC_title_contains_text">Titel enthält: ?</string>
 	<string name="gcal_TEA_error">Fehler beim Hinzufügen der Aufgabe zum Kalender!</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index f00426fde..c9c16a5a2 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -197,10 +197,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Προτεραιότητα τουλάχιστον ?</string>
 	<string name="CFC_importance_name">Προτεραιότητα..</string>
-	<string name="CFC_tag_text">Λίστα: ?</string>
-	<string name="CFC_tag_name">Λίστα...</string>
-	<string name="CFC_tag_contains_name">Η λίστα ονομάτων περιέχει...</string>
-	<string name="CFC_tag_contains_text">Η λίστα ονομάτων περιέχει: ?</string>
 	<string name="CFC_title_contains_name">Ο τίτλος περιέχει...</string>
 	<string name="CFC_title_contains_text">Ο τίτλος περιέχει: ?</string>
 	<string name="gcal_TEA_error">Σφάλμα πρόσθεσης καθήκοντος στο ημερολόγιο!</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 5489fba8c..9c4c9a78d 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -207,10 +207,6 @@
 	</string-array>
 	<string name="CFC_importance_text">¿Prioridad mínima?</string>
 	<string name="CFC_importance_name">Prioridad...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">El nombre de la lista contiene...</string>
-	<string name="CFC_tag_contains_text">El nombre de la lista contiene: ?</string>
 	<string name="CFC_title_contains_name">Título contiene...</string>
 	<string name="CFC_title_contains_text">Título contiene: ?</string>
 	<string name="gcal_TEA_error">¡Ocurrió un error al agregar la tarea al calendario!</string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index a79fa66a8..1b7e8234e 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -132,9 +132,6 @@
 	</string-array>
 	<string name="CFC_importance_text">اولویت در آخر؟</string>
 	<string name="CFC_importance_name">اولویت</string>
-	<string name="CFC_tag_name">لیست</string>
-	<string name="CFC_tag_contains_name">لیست نام ها شامل میشود</string>
-	<string name="CFC_tag_contains_text">لیست نام شامل میشود ؟</string>
 	<string name="CFC_title_contains_name">عنوان شامل</string>
 	<string name="gcal_TEA_error">خطا در اضافه کردن وظیفه به تقویم</string>
 	<string name="gcal_TEA_addToCalendar_label">اضاقه به تقویم</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index e0f6ca1a3..2e3508e11 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -41,10 +41,6 @@
 	<string name="CFC_dueBefore_name">Mennessä...</string>
 	<string name="CFC_importance_text">Prioriteetti vähintään ?</string>
 	<string name="CFC_importance_name">Prioriteetti...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">Listan nimi sisältää...</string>
-	<string name="CFC_tag_contains_text">Listan nimi sisältää: ?</string>
 	<string name="CFC_title_contains_name">Otsikko sisältää..</string>
 	<string name="CFC_title_contains_text">Otsikko sisältää: ?</string>
 	<string name="gcal_TEA_error">Virhe lisättäessä tapahtumaa kalenteriin!</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index a000d2f32..24b71ed25 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -206,10 +206,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Priorité au dernier ?</string>
 	<string name="CFC_importance_name">Priorité...</string>
-	<string name="CFC_tag_text">Liste : ?</string>
-	<string name="CFC_tag_name">Liste...</string>
-	<string name="CFC_tag_contains_name">Nom de liste contient...</string>
-	<string name="CFC_tag_contains_text">Nom de liste contient : ?</string>
 	<string name="CFC_title_contains_name">Titre contient...</string>
 	<string name="CFC_title_contains_text">Titre contient: ?</string>
 	<string name="gcal_TEA_error">Erreur d\'ajout de tâche à l\'agenda !</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 0a4746dfc..8ed852ca0 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -79,10 +79,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Prioritás legalább ?</string>
 	<string name="CFC_importance_name">Prioritás...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">A listanév tartalmazza ezt:</string>
-	<string name="CFC_tag_contains_text">A listanév tartalmazza ezt: ?</string>
 	<string name="CFC_title_contains_name">A név tartalmazza ezt..</string>
 	<string name="CFC_title_contains_text">A név tartalmazza ezt: ?</string>
 	<string name="gcal_TEA_error">Nem sikerült a feladat hozzáadása a naptárhoz!</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 80697ef6a..802afb500 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -209,10 +209,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	</string-array>
 	<string name="CFC_importance_text">Almeno per priorità ?</string>
 	<string name="CFC_importance_name">Priorità...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista..</string>
-	<string name="CFC_tag_contains_name">Lista il cui nome contiene...</string>
-	<string name="CFC_tag_contains_text">Lista il cui nome contiene: ?</string>
 	<string name="CFC_title_contains_name">Il titolo contiene...</string>
 	<string name="CFC_title_contains_text">Il titolo contiene: ?</string>
 	<string name="gcal_TEA_error">Errore durante l\'aggiunta dell\'attività al calendario!</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index dbeb20f2e..8813c3009 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -198,10 +198,6 @@
 	</string-array>
 	<string name="CFC_importance_text">עדיפות לפחות?</string>
 	<string name="CFC_importance_name">עדיפות</string>
-	<string name="CFC_tag_text">רשימה: ?</string>
-	<string name="CFC_tag_name">רשימה.</string>
-	<string name="CFC_tag_contains_name">שם הרשימה מכיל...</string>
-	<string name="CFC_tag_contains_text">שם הרשימה מכיל: ?</string>
 	<string name="CFC_title_contains_name">כותרת מכילה...</string>
 	<string name="CFC_title_contains_text">כותרת מכילה: ?</string>
 	<string name="gcal_TEA_error">שגיאה בהוספת המשימה ליומן!</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 639b59e16..e89e65c11 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -211,10 +211,6 @@
 	</string-array>
 	<string name="CFC_importance_text">優先順位は少なくとも ?</string>
 	<string name="CFC_importance_name">優先順位...</string>
-	<string name="CFC_tag_text">タグ: ?</string>
-	<string name="CFC_tag_name">タグ</string>
-	<string name="CFC_tag_contains_name">タグ中の語句</string>
-	<string name="CFC_tag_contains_text">タグに ? を含む ?</string>
 	<string name="CFC_title_contains_name">タイトル中の語句</string>
 	<string name="CFC_title_contains_text">タイトルに ? を含む</string>
 	<string name="gcal_TEA_error">カレンダーへの登録に失敗しました</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index c5c955d42..a6933e375 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -209,10 +209,6 @@ Tasks의 백업에서 당신의 일정을 복구하시기 바랍니다.
 	</string-array>
 	<string name="CFC_importance_text">최소 우선순위?</string>
 	<string name="CFC_importance_name">우선순위...</string>
-	<string name="CFC_tag_text">목록: ?</string>
-	<string name="CFC_tag_name">목록...</string>
-	<string name="CFC_tag_contains_name">목록이름이 다음을 포함...</string>
-	<string name="CFC_tag_contains_text">목록이름이 다음을 포함: ?</string>
 	<string name="CFC_title_contains_name">제목이 다음을 포함...</string>
 	<string name="CFC_title_contains_text">제목이 다음을 포함: ?</string>
 	<string name="gcal_TEA_error">달력에 일정 추가 실패!</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index ad9cacffd..0888399aa 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -103,10 +103,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Viktighet minst ?</string>
 	<string name="CFC_importance_name">Viktighet...</string>
-	<string name="CFC_tag_text">Liste: ?</string>
-	<string name="CFC_tag_name">Liste...</string>
-	<string name="CFC_tag_contains_name">Listenavn inneholder...</string>
-	<string name="CFC_tag_contains_text">Listenavn inneholder: ?</string>
 	<string name="CFC_title_contains_name">Tittel inneholder...</string>
 	<string name="CFC_title_contains_text">Tittel inneholder: ?</string>
 	<string name="gcal_TEA_error">Klarte ikke å legge oppgave til kalender!</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index e38a0cc87..69f0e827a 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -199,10 +199,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Prioriteit ten minste ?</string>
 	<string name="CFC_importance_name">Prioriteit...</string>
-	<string name="CFC_tag_text">Lijst: ?</string>
-	<string name="CFC_tag_name">Lijst...</string>
-	<string name="CFC_tag_contains_name">Lijstnaam bevat...</string>
-	<string name="CFC_tag_contains_text">Lijstnaam bevat: ?</string>
 	<string name="CFC_title_contains_name">Naam bevat...</string>
 	<string name="CFC_title_contains_text">Naam bevat: ?</string>
 	<string name="gcal_TEA_error">Fout bij toevoegen taak aan agenda!</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 5708ae329..9fb11860d 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -201,10 +201,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	</string-array>
 	<string name="CFC_importance_text">Priorytet przynajmniej?</string>
 	<string name="CFC_importance_name">Priorytet...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">Nazwa listy zawiera...</string>
-	<string name="CFC_tag_contains_text">Nazwa listy zawiera: ?</string>
 	<string name="CFC_title_contains_name">Tytuł zawiera...</string>
 	<string name="CFC_title_contains_text">Tytuł zawiera: ?</string>
 	<string name="gcal_TEA_error">Błąd podczas dodawania zadania do kalendarza!</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 165c63de4..e55dbc58e 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -197,10 +197,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Pelo menos por prioridade?</string>
 	<string name="CFC_importance_name">Prioridade...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">Nome da lista contém...</string>
-	<string name="CFC_tag_contains_text">Nome da lista contém: ?</string>
 	<string name="CFC_title_contains_name">Título...</string>
 	<string name="CFC_title_contains_text">Título contêm: ?</string>
 	<string name="gcal_TEA_error">Erro ao inserir a tarefa no calendário!</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 33a8a4f7f..ab44c6aa2 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -212,10 +212,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	</string-array>
 	<string name="CFC_importance_text">Prioridade mínima?</string>
 	<string name="CFC_importance_name">Importância...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">Nome da lista contém...</string>
-	<string name="CFC_tag_contains_text">Nome da lista contém: ?</string>
 	<string name="CFC_title_contains_name">Título contém...</string>
 	<string name="CFC_title_contains_text">Título contém: ?</string>
 	<string name="gcal_TEA_error">Erro ao adicionar tarefa ao calendário!</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a11ce6fde..82d798b88 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -211,10 +211,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Приоритет меньшего?</string>
 	<string name="CFC_importance_name">Приоритет...</string>
-	<string name="CFC_tag_text">Список: ?</string>
-	<string name="CFC_tag_name">Список...</string>
-	<string name="CFC_tag_contains_name">Название списка содержит...</string>
-	<string name="CFC_tag_contains_text">Название списка содержит...</string>
 	<string name="CFC_title_contains_name">Название содержит...</string>
 	<string name="CFC_title_contains_text">Название содержит: ?</string>
 	<string name="gcal_TEA_error">Ошибка при добавлении задачи в календарь!</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index c81e1b74f..1bc82fccc 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -204,10 +204,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Najnižšia priorita ?</string>
 	<string name="CFC_importance_name">Priorita...</string>
-	<string name="CFC_tag_text">Zoznam: ?</string>
-	<string name="CFC_tag_name">Zoznam...</string>
-	<string name="CFC_tag_contains_name">Názov zoznamu obsahuje...</string>
-	<string name="CFC_tag_contains_text">Názov zoznamu obsahuje...</string>
 	<string name="CFC_title_contains_name">Názov obsahuje...</string>
 	<string name="CFC_title_contains_text">Zoznam obsahuje: ?</string>
 	<string name="gcal_TEA_error">Chyba pridania úlohy do kalendára!</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 33330dbc2..ef427e44f 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -201,10 +201,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Prioriteta namanj ?</string>
 	<string name="CFC_importance_name">Prioriteta ...</string>
-	<string name="CFC_tag_text">Seznam: ?</string>
-	<string name="CFC_tag_name">Seznam ...</string>
-	<string name="CFC_tag_contains_name">Ime seznama vsebuje ...</string>
-	<string name="CFC_tag_contains_text">Ime seznama vsebuje: ?</string>
 	<string name="CFC_title_contains_name">Naslov vsebuje ...</string>
 	<string name="CFC_title_contains_text">Naslov vsebuje: ?</string>
 	<string name="gcal_TEA_error">Napaka pri dodajanju opravila!</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 048efbfea..b65bc47b6 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -195,10 +195,6 @@ och återställer dina aktuella uppgifter från en backup
 		<item>Nästa månad</item>
 	</string-array>
 	<string name="CFC_importance_name">Prioritet...</string>
-	<string name="CFC_tag_text">Lista: ?</string>
-	<string name="CFC_tag_name">Lista...</string>
-	<string name="CFC_tag_contains_name">Namnet på listan innehåller...</string>
-	<string name="CFC_tag_contains_text">Namnet på listan innehåller: ?</string>
 	<string name="CFC_title_contains_name">Titeln innehåller...</string>
 	<string name="CFC_title_contains_text">Titeln innehåller: ?</string>
 	<string name="gcal_TEA_error">Misslyckades med att lägga uppgift till kalender!</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index a9c2665cf..968010a70 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -176,10 +176,6 @@
 		<item>Gelecek Hafta</item>
 		<item>Gelecek Ay</item>
 	</string-array>
-	<string name="CFC_tag_text">Liste:?</string>
-	<string name="CFC_tag_name">Liste...</string>
-	<string name="CFC_tag_contains_name">Liste isminde şu olan:</string>
-	<string name="CFC_tag_contains_text">Liste isminde şu olan:?</string>
 	<string name="CFC_title_contains_name">Başlık şunu içersin...</string>
 	<string name="CFC_title_contains_text">Başlık şunu içersin:?</string>
 	<string name="gcal_TEA_error">Takvime görev eklenmesinde hata!</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index f502916e6..a99604218 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -206,10 +206,6 @@
 	</string-array>
 	<string name="CFC_importance_text">Пріоритет?</string>
 	<string name="CFC_importance_name">Пріоритет</string>
-	<string name="CFC_tag_text">Список: ?</string>
-	<string name="CFC_tag_name">Список...</string>
-	<string name="CFC_tag_contains_name">Ім\'я списку містить...</string>
-	<string name="CFC_tag_contains_text">Ім\'я списку містить: ?</string>
 	<string name="CFC_title_contains_name">Заголовок містить...</string>
 	<string name="CFC_title_contains_text">Заголовок містить: ?</string>
 	<string name="gcal_TEA_error">Помилка при додаванні завдання в календар!</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index f68876bc7..8924d0f95 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -156,10 +156,6 @@
 		<item>下周</item>
 		<item>下个月</item>
 	</string-array>
-	<string name="CFC_tag_text">列表：?</string>
-	<string name="CFC_tag_name">列表...</string>
-	<string name="CFC_tag_contains_name">列表名包含...</string>
-	<string name="CFC_tag_contains_text">列表名包含：?</string>
 	<string name="CFC_title_contains_name">标题含...</string>
 	<string name="CFC_title_contains_text">标题含: ?</string>
 	<string name="gcal_TEA_error">添加任务到日历时失败！</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 867a65392..fd030cff7 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -186,10 +186,6 @@
 		<item>下週</item>
 		<item>下個月</item>
 	</string-array>
-	<string name="CFC_tag_text">列表：?</string>
-	<string name="CFC_tag_name">列表...</string>
-	<string name="CFC_tag_contains_name">列表名包含...</string>
-	<string name="CFC_tag_contains_text">列表名包含：?</string>
 	<string name="CFC_title_contains_name">主旨含...</string>
 	<string name="CFC_title_contains_text">主旨含: ?</string>
 	<string name="gcal_TEA_error">工作加入行事曆錯誤</string>
diff --git a/src/main/res/values/strings-filters.xml b/src/main/res/values/strings-filters.xml
index 2919cba6a..41402471a 100644
--- a/src/main/res/values/strings-filters.xml
+++ b/src/main/res/values/strings-filters.xml
@@ -58,14 +58,14 @@
     <string name="CFC_importance_name">Priority...</string>        
     
     <!-- Criteria: tag - display text (? -> user input) -->
-    <string name="CFC_tag_text">List: ?</string>
+    <string name="CFC_tag_text">Tag: ?</string>
     <!-- Criteria: tag - name of criteria -->
-    <string name="CFC_tag_name">List...</string>
+    <string name="CFC_tag_name">Tag...</string>
     
     <!-- Criteria: tag_contains - name of criteria -->
-    <string name="CFC_tag_contains_name">List name contains...</string>
+    <string name="CFC_tag_contains_name">Tag name contains...</string>
     <!-- Criteria: tag_contains - text (? -> user input) -->
-    <string name="CFC_tag_contains_text">List name contains: ?</string>
+    <string name="CFC_tag_contains_text">Tag name contains: ?</string>
     
     <!-- Criteria: title_contains - name of criteria -->
     <string name="CFC_title_contains_name">Title contains...</string>