diff --git a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
index 225c832a1f64b..29c69d165b51b 100644
--- a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
+++ b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
@@ -4,6 +4,9 @@ import Select from 'react-select';
 import { Button, Row, Col } from 'react-bootstrap';
 import SelectControl from './SelectControl';
 
+const arrayFilterOps = ['in', 'not in'];
+const strFilterOps = ['==', '!=', '>', '<', '>=', '<=', 'regex'];
+
 const propTypes = {
   choices: PropTypes.array,
   changeFilter: PropTypes.func,
@@ -55,6 +58,15 @@ export default class Filter extends React.Component {
     if (event && event.value) {
       value = event.value;
     }
+    if (control === 'op') {
+      if (arrayFilterOps.indexOf(this.props.filter.op) !== -1
+        && strFilterOps.indexOf(value) !== -1) {
+        this.props.changeFilter('val', this.props.filter.val[0]);
+      } else if (strFilterOps.indexOf(this.props.filter.op) !== -1
+        && arrayFilterOps.indexOf(value) !== -1) {
+        this.props.changeFilter('val', [this.props.filter.val]);
+      }
+    }
     this.props.changeFilter(control, value);
     if (control === 'col' && value !== null && this.props.datasource.filter_select) {
       this.fetchFilterValues(value);
@@ -70,13 +82,13 @@ export default class Filter extends React.Component {
         this.fetchFilterValues(filter.col);
       }
     }
-    if (this.props.having) {
-      // druid having filter
+    if (this.props.having || strFilterOps.indexOf(filter.op) !== -1) {
+      // druid having filter or regex/==/!= filters
       return (
         <input
           type="text"
           onChange={this.changeFilter.bind(this, 'val')}
-          value={filter.value}
+          value={filter.val}
           className="form-control input-sm"
           placeholder="Filter value"
         />
diff --git a/superset/models.py b/superset/models.py
index cf6b1658b39d7..cd3ed4d25b907 100644
--- a/superset/models.py
+++ b/superset/models.py
@@ -1403,7 +1403,8 @@ def visit_column(element, compiler, **kw):
             col_obj = cols.get(col)
             if col_obj and op in ('in', 'not in'):
                 values = [types.strip("'").strip('"') for types in eq]
-                values = [utils.js_string_to_num(s) for s in values]
+                if col_obj.is_num:
+                    values = [utils.js_string_to_num(s) for s in values]
                 cond = col_obj.sqla_col.in_(values)
                 if op == 'not in':
                     cond = ~cond
@@ -2567,8 +2568,7 @@ def increment_timestamp(ts):
             query=query_str,
             duration=datetime.now() - qry_start_dttm)
 
-    @staticmethod
-    def get_filters(raw_filters):
+    def get_filters(self, raw_filters):
         filters = None
         for flt in raw_filters:
             if not all(f in flt for f in ['col', 'op', 'val']):
@@ -2577,21 +2577,24 @@ def get_filters(raw_filters):
             op = flt['op']
             eq = flt['val']
             cond = None
+            if op in ('in', 'not in'):
+                eq = [types.replace("'", '').strip() for types in eq]
+            if col in self.num_cols:
+                if op in ('in', 'not in'):
+                    eq = [utils.js_string_to_num(v) for v in eq]
+                else:
+                    eq = utils.js_string_to_num(eq)
             if op == '==':
                 cond = Dimension(col) == eq
             elif op == '!=':
                 cond = ~(Dimension(col) == eq)
             elif op in ('in', 'not in'):
                 fields = []
-                # Distinguish quoted values with regular value types
-                values = [types.replace("'", '') for types in eq]
-                values = [utils.js_string_to_num(s) for s in values]
-                if len(values) > 1:
-                    for s in values:
-                        s = s.strip()
+                if len(eq) > 1:
+                    for s in eq:
                         fields.append(Dimension(col) == s)
                     cond = Filter(type="or", fields=fields)
-                elif len(values) == 1:
+                elif len(eq) == 1:
                     cond = Dimension(col) == eq[0]
                 if op == 'not in':
                     cond = ~cond