diff --git a/superset/forms.py b/superset/forms.py
index b7606728dddf..0febecc2afb1 100755
--- a/superset/forms.py
+++ b/superset/forms.py
@@ -134,7 +134,7 @@ def __init__(self, viz):
         default_groupby = gb_cols[0] if gb_cols else None
         group_by_choices = self.choicify(gb_cols)
         order_by_choices = []
-        for s in sorted([c.column_name for c in datasource.columns]):
+        for s in sorted(datasource.column_names):
             order_by_choices.append((json.dumps([s, True]), s + ' [asc]'))
             order_by_choices.append((json.dumps([s, False]), s + ' [desc]'))
         # Pool of all the fields that can be used in Superset
diff --git a/superset/views.py b/superset/views.py
index 841c968b4376..af57e0fb4909 100755
--- a/superset/views.py
+++ b/superset/views.py
@@ -2122,7 +2122,7 @@ def fetch_datasource_metadata(self):
 
         gb_cols = [(col, col) for col in datasource.groupby_column_names]
         order_by_choices = []
-        for s in sorted(datasource.num_cols):
+        for s in sorted(datasource.column_names):
             order_by_choices.append((json.dumps([s, True]), s + ' [asc]'))
             order_by_choices.append((json.dumps([s, False]), s + ' [desc]'))
 
diff --git a/superset/viz.py b/superset/viz.py
index ce4ddecd26ab..22f74bcacf6b 100755
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -441,7 +441,7 @@ def query_obj(self):
         if fd.get('all_columns'):
             d['columns'] = fd.get('all_columns')
             d['groupby'] = []
-            order_by_cols = fd.get('order_by_cols', []) or []
+            order_by_cols = fd.get('order_by_cols') or []
             d['orderby'] = [json.loads(t) for t in order_by_cols]
         return d