diff --git a/front/core/components/field/style.scss b/front/core/components/field/style.scss
index ceaeda40a..9012b8c4c 100644
--- a/front/core/components/field/style.scss
+++ b/front/core/components/field/style.scss
@@ -71,7 +71,7 @@
                     color: $color-font;
 
                     &::placeholder {
-                        color: $color-font-bg;
+                        color: $color-font-bg-marginal;
                     }
                     &[type=time],
                     &[type=date],
diff --git a/modules/entry/front/latest-buys-search-panel/index.html b/modules/entry/front/latest-buys-search-panel/index.html
index 4693141f8..c4f9a4a72 100644
--- a/modules/entry/front/latest-buys-search-panel/index.html
+++ b/modules/entry/front/latest-buys-search-panel/index.html
@@ -81,18 +81,21 @@
                 on-change="itemTag.value = null">
             </vn-autocomplete>
             <vn-textfield
-                ng-show="tag.selection.isFree !== false"
+                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
                 vn-id="text"
                 label="Value"
                 ng-model="itemTag.value">
             </vn-textfield>
-            <vn-autocomplete
+            <vn-autocomplete 
+                vn-one
                 ng-show="tag.selection.isFree === false"
-                url="{{$ctrl.getSourceTable(tag.selection)}}"
+                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+                search-function="{value: $search}"
                 label="Value"
                 ng-model="itemTag.value"
-                show-field="name"
-                value-field="name">
+                show-field="value"
+                value-field="value"
+                rule>
             </vn-autocomplete>
             <vn-icon-button
                 vn-none
diff --git a/modules/entry/front/latest-buys-search-panel/index.js b/modules/entry/front/latest-buys-search-panel/index.js
index adc95f43d..ce9eddcca 100644
--- a/modules/entry/front/latest-buys-search-panel/index.js
+++ b/modules/entry/front/latest-buys-search-panel/index.js
@@ -55,18 +55,6 @@ class Controller extends SearchPanel {
         this.$.filter = value;
     }
 
-    getSourceTable(selection) {
-        if (!selection || selection.isFree === true)
-            return null;
-
-        if (selection.sourceTable) {
-            return ''
-                + selection.sourceTable.charAt(0).toUpperCase()
-                + selection.sourceTable.substring(1) + 's';
-        } else if (selection.sourceTable == null)
-            return `ItemTags/filterItemTags/${selection.id}`;
-    }
-
     removeField(index, field) {
         this.fieldFilters.splice(index, 1);
         this.$.filter[field] = undefined;
diff --git a/modules/item/back/methods/tag/filterValue.js b/modules/item/back/methods/tag/filterValue.js
index 062127a74..6344a5299 100644
--- a/modules/item/back/methods/tag/filterValue.js
+++ b/modules/item/back/methods/tag/filterValue.js
@@ -47,9 +47,14 @@ module.exports = Self => {
         const where = filter.where;
         if (where && where.value) {
             stmt.merge(conn.makeWhere({value: {like: `%${where.value}%`}}));
-            stmt.merge(`
-                ORDER BY value LIKE '${where.value}' DESC, 
-                    value LIKE '${where.value}%' DESC`);
+
+            const newStmt = new ParameterizedSQL(
+                `ORDER BY value LIKE ? DESC, 
+                    value LIKE ? DESC`, [
+                    where.value,
+                    `${where.value}%`
+                ]);
+            ParameterizedSQL.append(newStmt, stmt);
         }
 
         stmt.merge(conn.makeLimit(filter));
diff --git a/modules/item/front/search-panel/index.html b/modules/item/front/search-panel/index.html
index 57f05bb54..42e68c71c 100644
--- a/modules/item/front/search-panel/index.html
+++ b/modules/item/front/search-panel/index.html
@@ -72,19 +72,21 @@
             </vn-autocomplete>
             <vn-textfield
                 vn-one
-                ng-show="tag.selection.isFree !== false"
+                ng-show="tag.selection.isFree || tag.selection.isFree == undefined"
                 vn-id="text"
                 label="Value"
                 ng-model="itemTag.value">
             </vn-textfield>
-            <vn-autocomplete
+            <vn-autocomplete 
                 vn-one
                 ng-show="tag.selection.isFree === false"
-                url="{{$ctrl.getSourceTable(tag.selection)}}"
+                url="{{'Tags/' + itemTag.tagFk + '/filterValue'}}"
+                search-function="{value: $search}"
                 label="Value"
                 ng-model="itemTag.value"
-                show-field="name"
-                value-field="name">
+                show-field="value"
+                value-field="value"
+                rule>
             </vn-autocomplete>
             <vn-icon-button
                 vn-none
diff --git a/modules/item/front/search-panel/index.js b/modules/item/front/search-panel/index.js
index f1a3367c4..6a0f358eb 100644
--- a/modules/item/front/search-panel/index.js
+++ b/modules/item/front/search-panel/index.js
@@ -55,18 +55,6 @@ class Controller extends SearchPanel {
         this.$.filter = value;
     }
 
-    getSourceTable(selection) {
-        if (!selection || selection.isFree === true)
-            return null;
-
-        if (selection.sourceTable) {
-            return ''
-                + selection.sourceTable.charAt(0).toUpperCase()
-                + selection.sourceTable.substring(1) + 's';
-        } else if (selection.sourceTable == null)
-            return `ItemTags/filterItemTags/${selection.id}`;
-    }
-
     removeField(index, field) {
         this.fieldFilters.splice(index, 1);
         this.$.filter[field] = undefined;