diff --git a/app/config.js.j2 b/app/config.js.j2
index b80592d0d3..962519e3fa 100644
--- a/app/config.js.j2
+++ b/app/config.js.j2
@@ -9,6 +9,9 @@ window.ushahidi = {
 {% else %}
   gaEnabled: false,
 {% endif %}
+{% if GOOGLE_MAPS_API_KEY %}
+  googleMapsApiKey: '{{ GOOGLE_MAPS_API_KEY }}',
+{% endif %}
 {% if GTM_CONTAINER_ID %}
   googleTagManager: '{{ GTM_CONTAINER_ID }}',
 {% endif %}
diff --git a/legacy/app/common/directives/add-language.html b/legacy/app/common/directives/add-language.html
index 7d52f76226..8e1afa5c1b 100644
--- a/legacy/app/common/directives/add-language.html
+++ b/legacy/app/common/directives/add-language.html
@@ -10,6 +10,7 @@
                                   ng-options="lang.code as lang.name for lang in languagesToSelect"
                                   ng-value="lang.code"
                                   ng-change="selectLanguage(selectedLanguage)"
+                                  data-cy="custom-select"
                               >
                                   <option value="" translate="app.select_language">Select language</option>
                               </select>
diff --git a/legacy/app/data/common/post-edit-detail/post-messages-reply.html b/legacy/app/data/common/post-edit-detail/post-messages-reply.html
index 78373a2dab..5c0f131e78 100644
--- a/legacy/app/data/common/post-edit-detail/post-messages-reply.html
+++ b/legacy/app/data/common/post-edit-detail/post-messages-reply.html
@@ -2,7 +2,7 @@
   <form name="form" ng-submit="sendMessage()">
 
     <div class="form-field" ng-class="{ 'error': form.reply.$invalid && form.reply.$dirty }">
-      <textarea id="reply" name="reply" placeholder="Send message to {{ contact.contact }}" ng-model="message.reply_text" ng-minlength=2 ng-maxlength=140 required></textarea>
+      <textarea id="reply" name="reply" placeholder="Send message to {{ contact.contact }}" ng-model="message.reply_text" ng-minlength=2 ng-maxlength=160 required></textarea>
     </div>
     <div class="form-field">
       <button type="submit" class="button-alpha modal-trigger"
diff --git a/legacy/app/map/post-view-map.directive.js b/legacy/app/map/post-view-map.directive.js
index 325e5cdf80..818ef23a5c 100644
--- a/legacy/app/map/post-view-map.directive.js
+++ b/legacy/app/map/post-view-map.directive.js
@@ -77,32 +77,30 @@ function PostViewMap(PostEndpoint, Maps, _, PostFilters, L, $q, $rootScope, $com
             }
         }
 
-        function addPostsToMap(posts) {
+        function addPostsToMap(posts, shouldFitMapBoundary = true) {
             var geojson = L.geoJson(posts, {
                 pointToLayer: Maps.pointToLayer,
                 onEachFeature: onEachFeature
             });
 
             if (map.options.clustering) {
-
                 markers = markers ? markers : L.markerClusterGroup({
                     maxClusterRadius: map.options.cluster_radius
                 });
-                // This has to be done individually.
-                // Using clusterLayer.addLayers() breaks the clustering.
-                // Need to investigate as this should have been fixing in v1.0.0
-                angular.forEach(geojson.getLayers(), function (layer) {
-                    markers.addLayer(layer);
-                });
+
+                // Apparently cluster.addLayers doesn't break clustering anymore
+                markers.addLayers(geojson.getLayers());
             } else {
                 markers = geojson;
             }
             markers.addTo(map);
             geoJsonLayers.push(markers);
 
-            if (posts.features.length > 0) {
-                map.fitBounds(geojson.getBounds());
+            // Adjust map boundaries only when post fetching is first or last batch
+            if (posts.features.length > 0 && shouldFitMapBoundary) {
+                map.fitBounds(markers.getBounds());
             }
+
             // Focus map on data points but..
             // Avoid zooming further than 15 (particularly when we just have a single point)
             if (map.getZoom() > 15) {
@@ -193,7 +191,7 @@ function PostViewMap(PostEndpoint, Maps, _, PostFilters, L, $q, $rootScope, $com
             return getFirstPostChunk.$promise.then(function (posts) {
                 // Adding the first 200 posts to map here and getting the totals
                 $scope.stats.filteredPosts = posts.total;
-                addPostsToMap(posts)
+                addPostsToMap(posts, true)
 
                 // Moving on to request rest of the posts
                 if (posts.total > limit) {
@@ -202,9 +200,9 @@ function PostViewMap(PostEndpoint, Maps, _, PostFilters, L, $q, $rootScope, $com
                         let request = PostEndpoint.geojson(conditions);
                         currentGeoJsonRequests.push(request);
                         request.$promise.then(result => {
+                            // var isLastPostChunk = i + limit > posts.total;
                             addPostsToMap(result)
                         });
-
                     }
                 }
             });
diff --git a/root/src/index.ejs b/root/src/index.ejs
index 120986dea1..68b06db09d 100644
--- a/root/src/index.ejs
+++ b/root/src/index.ejs
@@ -90,16 +90,17 @@
       a.async = 1;
       a.src = g;
       m.parentNode.insertBefore(a, m);
-  })(
-      window,
-      document,
-      "script",
-      "//www.google-analytics.com/analytics.js",
-      "ga"
-  );
-
-  ga("create", window.ushahidi.gaKey, "auto");
-  ga("send", "pageview");
+    })(
+        window,
+        document,
+        "script",
+        "//www.google-analytics.com/analytics.js",
+        "ga"
+    );
+
+    ga("create", window.ushahidi.gaKey, "auto");
+    ga("send", "pageview");
+  }
   
   // Loading Google-Maps to enable use of Places-API
   if (window.ushahidi && window.ushahidi.googleMapsApiKey) {
@@ -122,7 +123,6 @@
           window.googlePlaces = new google.maps.places.PlacesService(e);
       });
   }
-}
 </script>