diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
index 6ff5ed32b205d..456e8defb189b 100644
--- a/superset/assets/src/explore/controls.jsx
+++ b/superset/assets/src/explore/controls.jsx
@@ -1506,7 +1506,7 @@ export const controls = {
     type: 'CheckboxControl',
     label: t('Rich Tooltip'),
     renderTrigger: true,
-    default: false,
+    default: true,
     description: t('The rich tooltip shows a list of all series for that ' +
     'point in time'),
   },
diff --git a/superset/connectors/druid/views.py b/superset/connectors/druid/views.py
index 82cd46215fe84..30906b1484cf4 100644
--- a/superset/connectors/druid/views.py
+++ b/superset/connectors/druid/views.py
@@ -211,7 +211,7 @@ class DruidDatasourceModelView(DatasourceModelView, DeleteMixin, YamlExportMixin
     order_columns = ['datasource_link', 'modified']
     related_views = [DruidColumnInlineView, DruidMetricInlineView]
     edit_columns = [
-        'datasource_name', 'cluster', 'slices', 'description', 'owner',
+        'datasource_name', 'cluster', 'description', 'owner',
         'is_hidden',
         'filter_select_enabled', 'fetch_values_from',
         'default_endpoint', 'offset', 'cache_timeout']
@@ -219,7 +219,7 @@ class DruidDatasourceModelView(DatasourceModelView, DeleteMixin, YamlExportMixin
         'datasource_name', 'cluster', 'description', 'owner',
     )
     add_columns = edit_columns
-    show_columns = add_columns + ['perm']
+    show_columns = add_columns + ['perm', 'slices']
     page_size = 500
     base_order = ('datasource_name', 'asc')
     description_columns = {
diff --git a/superset/db_engine_specs.py b/superset/db_engine_specs.py
index a718a0d62ca85..728d1d68310e7 100644
--- a/superset/db_engine_specs.py
+++ b/superset/db_engine_specs.py
@@ -680,6 +680,12 @@ def handle_cursor(cls, cursor, query, session):
                 break
 
             if stats:
+                state = stats.get('state')
+
+                # if already finished, then stop polling
+                if state == 'FINISHED':
+                    break
+
                 completed_splits = float(stats.get('completedSplits'))
                 total_splits = float(stats.get('totalSplits'))
                 if total_splits and completed_splits:
diff --git a/superset/views/core.py b/superset/views/core.py
index fe36ae7a5fe0f..6e4df9c693279 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -537,9 +537,9 @@ class DashboardModelView(SupersetModelView, DeleteMixin):  # noqa
     list_columns = ['dashboard_link', 'creator', 'modified']
     order_columns = ['modified']
     edit_columns = [
-        'dashboard_title', 'slug', 'slices', 'owners', 'position_json', 'css',
+        'dashboard_title', 'slug', 'owners', 'position_json', 'css',
         'json_metadata']
-    show_columns = edit_columns + ['table_names']
+    show_columns = edit_columns + ['table_names', 'slices']
     search_columns = ('dashboard_title', 'slug', 'owners')
     add_columns = edit_columns
     base_order = ('changed_on', 'desc')
@@ -562,10 +562,6 @@ class DashboardModelView(SupersetModelView, DeleteMixin):  # noqa
         'owners': _('Owners is a list of users who can alter the dashboard.'),
     }
     base_filters = [['slice', DashboardFilter, lambda: []]]
-    add_form_query_rel_fields = {
-        'slices': [['slices', SliceFilter, None]],
-    }
-    edit_form_query_rel_fields = add_form_query_rel_fields
     label_columns = {
         'dashboard_link': _('Dashboard'),
         'dashboard_title': _('Title'),
diff --git a/superset/viz.py b/superset/viz.py
index ac99f5e33400f..2cbaf542d24f6 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -944,9 +944,9 @@ def query_obj(self):
         return d
 
     def get_data(self, df):
-        df['x'] = df[[self.x_metric]]
-        df['y'] = df[[self.y_metric]]
-        df['size'] = df[[self.z_metric]]
+        df['x'] = df[[utils.get_metric_name(self.x_metric)]]
+        df['y'] = df[[utils.get_metric_name(self.y_metric)]]
+        df['size'] = df[[utils.get_metric_name(self.z_metric)]]
         df['shape'] = 'circle'
         df['group'] = df[[self.series]]