diff --git a/src/client/components/map/LeafletMap.js b/src/client/components/map/LeafletMap.js
index 56d2de0a5f1e498039a4676bcf6cb90518a31e60..ac417082cc46cdaa511faa6ebd179b32992e8518 100644
--- a/src/client/components/map/LeafletMap.js
+++ b/src/client/components/map/LeafletMap.js
@@ -19,7 +19,7 @@ import MarkerCluster from './MarkerCluster';
 //
 // import { GoogleLayer } from 'react-leaflet-google';
 // https://console.developers.google.com/apis/credentials?project=hipla-187309
-// const key = 'AIzaSyCKWw5FjhwLsfp_l2gjVAifPkT)3cxGXhA4';
+// const gKey = 'AIzaSyCKWw5FjhwLsfp_l2gjVAifPkT)3cxGXhA4';
 // const road = 'ROADMAP'; // displays the default road map view. This is the default map type.
 // const satellite = 'SATELLITE'; // displays Google Earth satellite images.
 // const hybrid = 'HYBRID'; // displays a mixture of normal and satellite views.
@@ -64,23 +64,23 @@ class LeafletMap extends React.Component {
             />
           </BaseLayer>
           {/* <BaseLayer name='Google Maps Roads'>
-            <GoogleLayer googlekey={key}  maptype={road}/>
+            <GoogleLayer googlekey={gKey}  maptype={road}/>
             </BaseLayer>
             <BaseLayer name='Google Maps Satellite'>
-            <GoogleLayer googlekey={key}  maptype={satellite} />
+            <GoogleLayer googlekey={gKey}  maptype={satellite} />
             </BaseLayer>
             <BaseLayer name='Google Maps Hybrid'>
-            <GoogleLayer googlekey={key}  maptype={hybrid} />
+            <GoogleLayer googlekey={gKey}  maptype={hybrid} />
             </BaseLayer>
             <BaseLayer name='Google Maps Terrain'>
-            <GoogleLayer googlekey={key}  maptype={terrain} />
-            </BaseLayer>
-            <BaseLayer name="MML Maastokartta">
+            <GoogleLayer googlekey={gKey}  maptype={terrain} />
+          </BaseLayer> */}
+          <BaseLayer name="MML Maastokartta">
             <TileLayer
               attribution="SeCo"
               url="https://avoin-karttakuva.maanmittauslaitos.fi/avoin/wmts/1.0.0/maastokartta/default/{TileMatrixSet}/{TileMatrix}/{TileRow}/{TileCol}.png"
             />
-          </BaseLayer> */}
+          </BaseLayer>
           <Overlay name="Karelian maps">
             <TileLayer
               attribution="SeCo"
diff --git a/src/client/reducers/options.js b/src/client/reducers/options.js
index 6a87159701c5d688eb6781884e2f5d8d9e8d247b..217020ce46420d9831c0068369100f8f144c80ae 100644
--- a/src/client/reducers/options.js
+++ b/src/client/reducers/options.js
@@ -6,7 +6,7 @@ import {
 
 const DEFAULT_LANGUAGE = 'en';
 const DEFAULT_RESULT_FORMAT = 'table';
-const DEFAULT_MAP_MODE = 'noCluster';
+const DEFAULT_MAP_MODE = 'cluster';
 
 export const INITIAL_STATE = {
   language: DEFAULT_LANGUAGE,