diff --git a/frappe/geo/utils.py b/frappe/geo/utils.py
index f1102f2289..f4b0284226 100644
--- a/frappe/geo/utils.py
+++ b/frappe/geo/utils.py
@@ -41,7 +41,7 @@ def merge_location_features_in_one(coords):
     '''Merging all features from location field.'''
     geojson_dict = []
     for element in coords:
-        geojson_loc = json.loads(element['location'])
+        geojson_loc = frappe.parse_json(element['location'])
         for coord in geojson_loc['features']:
             coord['properties']['name'] = element['name']
             geojson_dict.append(coord.copy())
diff --git a/frappe/public/js/frappe/list/list_sidebar.js b/frappe/public/js/frappe/list/list_sidebar.js
index b3f65253c7..4d637602a3 100644
--- a/frappe/public/js/frappe/list/list_sidebar.js
+++ b/frappe/public/js/frappe/list/list_sidebar.js
@@ -91,11 +91,10 @@ frappe.views.ListSidebar = class ListSidebar {
 			show_list_link = true;
 		}
 		
-		if ((JSON.stringify(frappe.listview_settings) !== '{}' &&
-            frappe.listview_settings[this.list_view.doctype].get_coords_method) ||
-            (this.list_view.meta.fields.find(i => i.fieldname === "latitude") &&
-            this.list_view.meta.fields.find(i => i.fieldname === "longitude")) ||
-			(this.list_view.meta.fields.find(i => i.fieldname === 'location') && this.list_view.meta.fields.find(i => i.fieldtype === 'Geolocation'))) {
+		if (this.list_view.settings.get_coords_method ||
+			(this.list_view.meta.fields.find(i => i.fieldname === "latitude") &&
+			this.list_view.meta.fields.find(i => i.fieldname === "longitude")) ||
+			(this.list_view.meta.fields.find(i => i.fieldname === 'location' && i.fieldtype == 'Geolocation')))
 			this.sidebar.find('.list-link[data-view="Map"]').removeClass('hide');
 			show_list_link = true;
 		}