diff --git a/package-lock.json b/package-lock.json
index 08132b1ceaa41a76fad605379e5f2ddcf375622b..2b0e1235969788c4f63e3b4155c2a52f2dfada9d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12868,7 +12868,6 @@
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -13037,7 +13036,6 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
-              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
diff --git a/src/client/components/VirtualizedTable.js b/src/client/components/VirtualizedTable.js
index 31b72397c2cf956c8a26c5dcb5ad90ed0f6819d9..9dc3837e4e39bd6453974828bc293b580935d846 100644
--- a/src/client/components/VirtualizedTable.js
+++ b/src/client/components/VirtualizedTable.js
@@ -158,16 +158,16 @@ class VirtualizedTable extends React.PureComponent {
       this.props.removeTempMarker();
     };
 
-    const searchField = (
-      <SearchField
-        search={this.props.search}
-        fetchManuscripts={this.props.fetchManuscripts}
-        fetchPlaces={this.props.fetchPlaces}
-        updateQuery={this.props.updateQuery}
-        clearManuscripts={this.props.clearManuscripts}
-        clearPlaces={this.props.clearPlaces}
-      />
-    );
+    // const searchField = (
+    //   <SearchField
+    //     search={this.props.search}
+    //     fetchManuscripts={this.props.fetchManuscripts}
+    //     fetchPlaces={this.props.fetchPlaces}
+    //     updateQuery={this.props.updateQuery}
+    //     clearManuscripts={this.props.clearManuscripts}
+    //     clearPlaces={this.props.clearPlaces}
+    //   />
+    // );
 
     const valueFromArray = (property, rowData) => {
       if (rowData[property] === 'Undefined') {
@@ -181,9 +181,7 @@ class VirtualizedTable extends React.PureComponent {
       <div className={classes.root}>
         <Grid container className={classes.container}>
           <div className={classes.resultsInfo}>
-            <div className={classes.searchField}>
-              {searchField}
-            </div>
+        
           </div>
           {this.props.list.size > 0 &&
             <div style={{ flex: '1 1 auto' }}>
diff --git a/src/client/components/map/LeafletMap.js b/src/client/components/map/LeafletMap.js
index c388771d44f561d6b44e5d63daad8770f3ef3487..8370dfe2184f5e567a30a4158d3339b7210ded57 100644
--- a/src/client/components/map/LeafletMap.js
+++ b/src/client/components/map/LeafletMap.js
@@ -34,6 +34,8 @@ const style = {
 class LeafletMap extends React.Component {
 
   componentDidMount() {
+    this.props.fetchManuscripts();
+    this.props.fetchPlaces();
 
     // Base layers
     const OSMBaseLayer = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
@@ -261,6 +263,8 @@ class LeafletMap extends React.Component {
 }
 
 LeafletMap.propTypes = {
+  fetchPlaces: PropTypes.func.isRequired,
+  fetchManuscripts: PropTypes.func.isRequired,
   results: PropTypes.array,
   mapMode: PropTypes.string.isRequired,
   geoJSON: PropTypes.array,
diff --git a/src/client/containers/MapApp.js b/src/client/containers/MapApp.js
index 7e53045e0cd370b720c7bda0da5917b546bdde09..de6e9a09f558c5205d857cb6706a90240f2e1b76 100644
--- a/src/client/containers/MapApp.js
+++ b/src/client/containers/MapApp.js
@@ -179,6 +179,8 @@ let MapApp = (props) => {
     } else {
       mapElement = (
         <LeafletMap
+          fetchPlaces={props.fetchPlaces}
+          fetchManuscripts={props.fetchManuscripts}
           results={creationPlaces}
           mapMode={options.mapMode}
           geoJSON={map.geoJSON}