diff --git a/frontend/src/metabase/lib/query/field.js b/frontend/src/metabase/lib/query/field.js
index 266bfee8133a094c46561bd724000a983f87cc40..8fa7e367af1870553b1e689cadf05a94947a0a0d 100644
--- a/frontend/src/metabase/lib/query/field.js
+++ b/frontend/src/metabase/lib/query/field.js
@@ -3,6 +3,7 @@ import { mbqlEq } from "./util";
 
 import type { Field as FieldReference } from "metabase/meta/types/Query";
 import type { Field, FieldId, FieldValues } from "metabase/meta/types/Field";
+import type { Value } from "metabase/meta/types/Dataset";
 
 // gets the target field ID (recursively) from any type of field, including raw field ID, fk->, and datetime-field cast.
 export function getFieldTargetId(field: FieldReference): ?FieldId {
diff --git a/frontend/src/metabase/lib/schema_metadata.js b/frontend/src/metabase/lib/schema_metadata.js
index ca632802a2eb9f951e29c53810211ad122567ef5..cdcc1e330d0c40739ea8762ea01acc8989993ea3 100644
--- a/frontend/src/metabase/lib/schema_metadata.js
+++ b/frontend/src/metabase/lib/schema_metadata.js
@@ -1,7 +1,7 @@
 import _ from "underscore";
 
 import { isa, isFK as isTypeFK, isPK as isTypePK, TYPE } from "metabase/lib/types";
-import { getFieldValues, getHumanReadableValue } from "metabase/lib/query/field";
+import { getFieldValues } from "metabase/lib/query/field";
 
 // primary field types used for picking operators, etc
 export const NUMBER = "NUMBER";
@@ -182,7 +182,8 @@ function equivalentArgument(field, table) {
                     .filter(([value, displayValue]) => value != null)
                     .map(([value, displayValue]) => ({
                         key: value,
-                        name: getHumanReadableValue(value, values)
+                        // NOTE Atte Keinänen 8/7/17: Similar logic as in getHumanReadableValue of lib/query/field
+                        name: displayValue ? displayValue : String(value)
                     }))
                     .sort((a, b) => a.key === b.key ? 0 : (a.key < b.key ? -1 : 1))
             };