diff --git a/superset-frontend/spec/javascripts/explore/AdhocFilter_spec.js b/superset-frontend/spec/javascripts/explore/AdhocFilter_spec.js
index a559bd7099018..dd4818128e363 100644
--- a/superset-frontend/spec/javascripts/explore/AdhocFilter_spec.js
+++ b/superset-frontend/spec/javascripts/explore/AdhocFilter_spec.js
@@ -40,6 +40,7 @@ describe('AdhocFilter', () => {
       filterOptionName: adhocFilter.filterOptionName,
       sqlExpression: null,
       fromFormData: false,
+      isExtra: false,
     });
   });
 
diff --git a/superset-frontend/src/explore/components/AdhocFilterOption.jsx b/superset-frontend/src/explore/components/AdhocFilterOption.jsx
index aef295875ffca..10979c24ffad1 100644
--- a/superset-frontend/src/explore/components/AdhocFilterOption.jsx
+++ b/superset-frontend/src/explore/components/AdhocFilterOption.jsx
@@ -19,13 +19,13 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Label, OverlayTrigger } from 'react-bootstrap';
+import { t } from '@superset-ui/translation';
 
 import AdhocFilterEditPopover from './AdhocFilterEditPopover';
 import AdhocFilter from '../AdhocFilter';
 import columnType from '../propTypes/columnType';
 import adhocMetricType from '../propTypes/adhocMetricType';
 import InfoTooltipWithTrigger from '../../components/InfoTooltipWithTrigger';
-import { t } from '@superset-ui/translation';
 
 const propTypes = {
   adhocFilter: PropTypes.instanceOf(AdhocFilter).isRequired,
@@ -95,7 +95,7 @@ export default class AdhocFilterOption extends React.PureComponent {
         onExited={this.onOverlayExited}
       >
         <div>
-          {adhocFilter.isExtra &&
+          {adhocFilter.isExtra && (
             <InfoTooltipWithTrigger
               icon="exclamation-triangle"
               placement="top"
@@ -105,7 +105,7 @@ export default class AdhocFilterOption extends React.PureComponent {
                 It won't be saved when saving the chart.
               `)}
             />
-          }
+          )}
           <Label className="adhoc-filter-option">
             <div onMouseDownCapture={this.onMouseDown}>
               <span className="m-r-5 option-label">
diff --git a/superset/examples/random_time_series.py b/superset/examples/random_time_series.py
index 151d04c7f4a23..7ce865cbd33fd 100644
--- a/superset/examples/random_time_series.py
+++ b/superset/examples/random_time_series.py
@@ -60,8 +60,8 @@ def load_random_time_series_data(only_metadata=False, force=False):
     slice_data = {
         "granularity_sqla": "day",
         "row_limit": config["ROW_LIMIT"],
-        "since": "1 year ago",
-        "until": "now",
+        "since": "2019-01-01",
+        "until": "2019-02-01",
         "metric": "count",
         "viz_type": "cal_heatmap",
         "domain_granularity": "month",
diff --git a/superset/utils/core.py b/superset/utils/core.py
index 1fc74d24d4964..e23b4695911f4 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -805,7 +805,7 @@ def to_adhoc(filt, expressionType="SIMPLE", clause="where"):
         "clause": clause.upper(),
         "expressionType": expressionType,
         "filterOptionName": str(uuid.uuid4()),
-        "isExtra": filt.get("isExtra"),
+        "isExtra": True if filt.get("isExtra") is True else False,
     }
 
     if expressionType == "SIMPLE":
diff --git a/superset/views/core.py b/superset/views/core.py
index 114e25d83d5ed..eb8efb15d3f9a 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -974,7 +974,7 @@ def save_or_overwrite_slice(
             slc = Slice(owners=[g.user] if g.user else [])
 
         form_data["adhoc_filters"] = self.remove_extra_filters(
-            form_data["adhoc_filters"]
+            form_data.get("adhoc_filters", [])
         )
 
         slc.params = json.dumps(form_data, indent=2, sort_keys=True)
diff --git a/tests/core_tests.py b/tests/core_tests.py
index 8b4ce6978edab..8d5641bb350f7 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -288,9 +288,10 @@ def test_save_slice(self):
         self.login(username="admin")
         slice_name = f"Energy Sankey"
         slice_id = self.get_slice(slice_name, db.session).id
-        copy_name = f"Test Sankey Save_{random.random()}"
+        copy_name_prefix = "Test Sankey"
+        copy_name = f"{copy_name_prefix}[save]{random.random()}"
         tbl_id = self.table_ids.get("energy_usage")
-        new_slice_name = f"Test Sankey Overwrite_{random.random()}"
+        new_slice_name = f"{copy_name_prefix}[overwrite]{random.random()}"
 
         url = (
             "/superset/explore/table/{}/?slice_name={}&"
@@ -298,8 +299,9 @@ def test_save_slice(self):
         )
 
         form_data = {
+            "adhoc_filters": [],
             "viz_type": "sankey",
-            "groupby": "target",
+            "groupby": ["target"],
             "metric": "sum__value",
             "row_limit": 5000,
             "slice_id": slice_id,
@@ -319,8 +321,9 @@ def test_save_slice(self):
         self.assertEqual(slc.viz.form_data, form_data)
 
         form_data = {
+            "adhoc_filters": [],
             "viz_type": "sankey",
-            "groupby": "source",
+            "groupby": ["source"],
             "metric": "sum__value",
             "row_limit": 5000,
             "slice_id": new_slice_id,
@@ -338,7 +341,13 @@ def test_save_slice(self):
         self.assertEqual(slc.viz.form_data, form_data)
 
         # Cleanup
-        db.session.delete(slc)
+        slices = (
+            db.session.query(Slice)
+            .filter(Slice.slice_name.like(copy_name_prefix + "%"))
+            .all()
+        )
+        for slc in slices:
+            db.session.delete(slc)
         db.session.commit()
 
     def test_filter_endpoint(self):
diff --git a/tests/viz_tests.py b/tests/viz_tests.py
index 80da72ec52948..ab10f49706658 100644
--- a/tests/viz_tests.py
+++ b/tests/viz_tests.py
@@ -1081,6 +1081,7 @@ def test_filter_nulls(self, mock_uuid4):
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lat",
+                    "isExtra": False,
                 },
                 {
                     "clause": "WHERE",
@@ -1089,6 +1090,7 @@ def test_filter_nulls(self, mock_uuid4):
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lon",
+                    "isExtra": False,
                 },
             ],
             "delimited_key": [
@@ -1099,6 +1101,7 @@ def test_filter_nulls(self, mock_uuid4):
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "lonlat",
+                    "isExtra": False,
                 }
             ],
             "geohash_key": [
@@ -1109,6 +1112,7 @@ def test_filter_nulls(self, mock_uuid4):
                     "comparator": "",
                     "operator": "IS NOT NULL",
                     "subject": "geo",
+                    "isExtra": False,
                 }
             ],
         }