diff --git a/templates/choose-model.tmpl b/templates/choose-model.tmpl
index 84f2ee67c1..96c8cd7da0 100644
--- a/templates/choose-model.tmpl
+++ b/templates/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Modify {printer_name}:Add Printer}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Select Another Make/Manufacturer"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filter by Model:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Model:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/da/choose-model.tmpl b/templates/da/choose-model.tmpl
index b12442a53e..2756a4af36 100644
--- a/templates/da/choose-model.tmpl
+++ b/templates/da/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Rediger {printer_name}:Tilføj printer}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@ Del {?printer_is_shared=?ikke:{?printer_is_shared=0?ikke:}} printeren</TD>
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Vælg en anden producent"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filtrer efter model:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Model:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/de/choose-model.tmpl b/templates/de/choose-model.tmpl
index 8f3923fe65..5746358f47 100644
--- a/templates/de/choose-model.tmpl
+++ b/templates/de/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?{printer_name} ändern:Drucker hinzufügen (Schritt 5/5)}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@ Drucker {?printer_is_shared=?nicht:{?printer_is_shared=0?nicht:}} im Netzwerk fr
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Anderen Hersteller/Marke wählen"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Nach Modell filtern:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Modell:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/es/choose-model.tmpl b/templates/es/choose-model.tmpl
index 1b7645cd4d..d8843d60d5 100644
--- a/templates/es/choose-model.tmpl
+++ b/templates/es/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:A&ntilde;adir impresora}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Seleccione otra marca/fabricante"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filtrar por modelo:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Modelo:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/fr/choose-model.tmpl b/templates/fr/choose-model.tmpl
index 25fd2392f7..11d9d63ffe 100644
--- a/templates/fr/choose-model.tmpl
+++ b/templates/fr/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Modifier  {printer_name}:Ajouter une imprimante}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Choisir un autre fabricant"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filtrer par modèle :</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Modèle :</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/ja/choose-model.tmpl b/templates/ja/choose-model.tmpl
index 1987c5039e..3c8df01f7b 100644
--- a/templates/ja/choose-model.tmpl
+++ b/templates/ja/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?{printer_name}の変更:プリンターの追加}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="他のメーカー/製造元を選択"></TD>
 </TR>
 <TR>
+<TH CLASS="label">モデルフィルター:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">モデル:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/pl/choose-model.tmpl b/templates/pl/choose-model.tmpl
index c5d40d225a..8a62b305b7 100644
--- a/templates/pl/choose-model.tmpl
+++ b/templates/pl/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Modyfikowanie {printer_name}:Dodawanie drukarki}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Wybierz innego producenta"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filtruj według modelu:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Model:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/pt_BR/choose-model.tmpl b/templates/pt_BR/choose-model.tmpl
index 6fd91d9782..a4572dc4df 100644
--- a/templates/pt_BR/choose-model.tmpl
+++ b/templates/pt_BR/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Modificar {printer_name}:Adicionar impressora}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Selecione outro fabricante"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Filtrar por modelo:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Modelo:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">
diff --git a/templates/ru/choose-model.tmpl b/templates/ru/choose-model.tmpl
index dab499a94c..7abaf979fe 100644
--- a/templates/ru/choose-model.tmpl
+++ b/templates/ru/choose-model.tmpl
@@ -1,5 +1,22 @@
 <H2 CLASS="title">{op=modify-printer?Изменение {printer_name}:Добавление принтера}</H2>
 
+<SCRIPT TYPE="text/javascript"><!--
+function filterItems(el) {
+  var value = el.value.toLowerCase();
+  var form = el.form;
+  var sel = form.PPD_NAME;
+  var opt = sel.options;
+
+  for (var i=0; i<opt.length; i++) {
+    if (value && opt[i].text.toLowerCase().indexOf(value) == -1) {
+      opt[i].hidden = true;
+    } else {
+      opt[i].hidden = false;
+    }
+  }
+}
+--></SCRIPT>
+
 <FORM METHOD="POST" ACTION="/admin" ENCTYPE="multipart/form-data">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
@@ -35,6 +52,10 @@
 <TD>{PPD_MAKE} <INPUT TYPE="SUBMIT" NAME="SELECT_MAKE" VALUE="Выбрать другого производителя"></TD>
 </TR>
 <TR>
+<TH CLASS="label">Фильтр по модели:</TH>
+<TD><INPUT TYPE="TEXT" NAME="PPD_FILTER" PLACEHOLDER="🔍" ONKEYUP="filterItems(this);"></TD>
+</TR>
+<TR>
 <TH CLASS="label">Модель:</TH>
 <TD>
 <SELECT NAME="PPD_NAME" SIZE="10">