diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
index fa0a679c459d5e..b501d84f10ac4c 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -423,6 +423,7 @@ function VisEditor(
     const searchSourceGrandparent = searchSourceParent.getParent();
 
     delete savedVis.savedSearchId;
+    delete vis.savedSearchId;
     searchSourceParent.setField('filter', _.union(searchSource.getOwnField('filter'), searchSourceParent.getOwnField('filter')));
 
     $state.query = searchSourceParent.getField('query');
diff --git a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index 8909fabb97b33c..0e31ccf3138634 100644
--- a/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/core_plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -141,6 +141,8 @@ uiModules
         self.visState
       );
 
+      self.vis.savedSearchId = self.savedSearchId;
+
       return self.vis;
     };
 
@@ -150,6 +152,7 @@ uiModules
       self.vis.indexPattern = self.searchSource.getField('index');
       self.visState.title = self.title;
       self.vis.setState(self.visState);
+      self.vis.savedSearchId = self.savedSearchId;
     };
 
     return SavedVis;
diff --git a/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js b/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
index a0736ebd2f5264..041030a9afb2a8 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_geo_hash.js
@@ -94,7 +94,7 @@ describe('Geohash Agg', () => {
 
   describe('precision parameter', () => {
 
-    const PRECISION_PARAM_INDEX = 6;
+    const PRECISION_PARAM_INDEX = 7;
     let precisionParam;
     beforeEach(() => {
       precisionParam = geoHashBucketAgg.params[PRECISION_PARAM_INDEX];
diff --git a/src/ui/public/agg_types/buckets/geo_hash.js b/src/ui/public/agg_types/buckets/geo_hash.js
index 1ade0f904c3321..a532b9d6780b5d 100644
--- a/src/ui/public/agg_types/buckets/geo_hash.js
+++ b/src/ui/public/agg_types/buckets/geo_hash.js
@@ -100,6 +100,11 @@ export const geoHashBucketAgg = new BucketAggType({
       default: [0, 0],
       write: _.noop
     },
+    {
+      name: 'mapBounds',
+      default: null,
+      write: _.noop
+    },
     {
       name: 'precision',
       editor: precisionTemplate,
diff --git a/src/ui/public/vis/agg_configs.js b/src/ui/public/vis/agg_configs.js
index 6aebeabd081599..33ba6e163d2ec8 100644
--- a/src/ui/public/vis/agg_configs.js
+++ b/src/ui/public/vis/agg_configs.js
@@ -52,7 +52,7 @@ class AggConfigs extends IndexedArray {
 
     super({
       index: ['id'],
-      group: ['schema.group', 'type.name', 'schema.name'],
+      group: ['schema.group', 'type.name', 'type.type', 'schema.name'],
     });
 
     this.indexPattern = indexPattern;
@@ -152,7 +152,7 @@ class AggConfigs extends IndexedArray {
 
     if (hierarchical) {
       // collect all metrics, and filter out the ones that we won't be copying
-      nestedMetrics = _(this.bySchemaGroup.metrics)
+      nestedMetrics = _(this.byTypeType.metrics)
         .filter(function (agg) {
           return agg.type.name !== 'count';
         })