diff --git a/contribs/gmf/apps/desktop/index.html.ejs b/contribs/gmf/apps/desktop/index.html.ejs
index 29591c50fbb8..e68f1284f46e 100644
--- a/contribs/gmf/apps/desktop/index.html.ejs
+++ b/contribs/gmf/apps/desktop/index.html.ejs
@@ -318,6 +318,7 @@
         ngeo-resizemap-state="profileChartActive">
       </gmf-profile>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
diff --git a/contribs/gmf/apps/desktop_alt/index.html.ejs b/contribs/gmf/apps/desktop_alt/index.html.ejs
index e91e7008ebf1..f299b35f6723 100644
--- a/contribs/gmf/apps/desktop_alt/index.html.ejs
+++ b/contribs/gmf/apps/desktop_alt/index.html.ejs
@@ -349,6 +349,7 @@
         ngeo-resizemap-state="queryGridActive">
       </gmf-displayquerygrid>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <script src="https://maps.googleapis.com/maps/api/js?v=3&key=AIzaSyCYnqxEQA5sz13sWSgMr97ejzvUeGP8gz4"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
index 817a20515a8c..52151b6b8401 100644
--- a/contribs/gmf/apps/mobile/index.html.ejs
+++ b/contribs/gmf/apps/mobile/index.html.ejs
@@ -169,6 +169,7 @@
         </gmf-authentication>
       </div>
     </ngeo-modal>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
index 66e364ac1eb4..a2005644cfb3 100644
--- a/contribs/gmf/apps/mobile_alt/index.html.ejs
+++ b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -163,6 +163,7 @@
         gmf-mobile-nav-back="authCtrl.gmfUser.username !== null">
       </gmf-authentication>
     </nav>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
diff --git a/contribs/gmf/apps/oeedit/index.html.ejs b/contribs/gmf/apps/oeedit/index.html.ejs
index 38dbd0abeea0..3fbbfdd00c59 100644
--- a/contribs/gmf/apps/oeedit/index.html.ejs
+++ b/contribs/gmf/apps/oeedit/index.html.ejs
@@ -170,6 +170,7 @@
         ngeo-resizemap-state="profileChartActive">
       </gmf-profile>
     </footer>
+    <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=es6"></script>
     <% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
     <script src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"></script>
     <% } %>
diff --git a/contribs/gmf/src/query/grid.less b/contribs/gmf/src/query/grid.less
index b30a9ab4e4be..780b35204251 100644
--- a/contribs/gmf/src/query/grid.less
+++ b/contribs/gmf/src/query/grid.less
@@ -10,6 +10,7 @@
   background-color: white;
   height: @grid-height;
   position: fixed;
+  width: 100%;
 
   .ngeo-grid-table-container {
     height: @table-height;
diff --git a/contribs/gmf/src/search/search.less b/contribs/gmf/src/search/search.less
index 78708fc2a6eb..c0aa88504d83 100644
--- a/contribs/gmf/src/search/search.less
+++ b/contribs/gmf/src/search/search.less
@@ -9,11 +9,13 @@ gmf-search {
   z-index: @content-index;
 
   & > * {
-    display: inline-block;
+    display: block;
+    float: left;
     vertical-align: top;
   }
 
   .gmf-search {
+    margin-right: @half-app-margin;
     background-color: @map-tools-bg-color;
     height: @map-tools-size;
     position: relative;