You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2025/01/13 16:10:12 UTC

(incubator-baremaps) branch main updated: Materialized views refresher (#915)

This is an automated email from the ASF dual-hosted git repository.

bchapuis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git


The following commit(s) were added to refs/heads/main by this push:
     new 9e1b882e0 Materialized views refresher (#915)
9e1b882e0 is described below

commit 9e1b882e0328a5a832d4c8651c5440922420d31b
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Mon Jan 13 17:10:08 2025 +0100

    Materialized views refresher (#915)
    
    Adds some utilities to refresh materialized views
---
 .../baremaps/tasks/RefreshMaterializedViews.java   |  73 ++++++
 .../java/org/apache/baremaps/workflow/Task.java    |   1 +
 .../refresh/DatabaseMetadataRetriever.java         | 220 ++++++++++++++++
 .../postgres/refresh/DependencyGraphBuilder.java   | 113 ++++++++
 .../refresh/MaterializedViewRefresher.java         |  97 +++++++
 basemap/create.js                                  |   2 +-
 basemap/layers/amenity/create.sql                  | 267 +++++++++++++++++--
 basemap/layers/amenity/refresh.sql                 | 292 ---------------------
 basemap/layers/highway/create.sql                  | 150 +++++++++--
 basemap/layers/highway/refresh.sql                 | 163 ------------
 basemap/layers/landuse/create.sql                  | 267 +++++++++++++++++--
 basemap/layers/landuse/refresh.sql                 | 292 ---------------------
 basemap/layers/leisure/create.sql                  | 267 +++++++++++++++++--
 basemap/layers/leisure/refresh.sql                 | 292 ---------------------
 basemap/layers/member/create.sql                   |   9 +-
 basemap/layers/member/refresh.sql                  |  22 --
 basemap/layers/natural/create.sql                  | 267 +++++++++++++++++--
 basemap/layers/natural/refresh.sql                 | 292 ---------------------
 basemap/layers/node/create.sql                     |  18 +-
 basemap/layers/node/refresh.sql                    |  29 --
 basemap/layers/ocean/create.sql                    |  20 +-
 basemap/layers/ocean/refresh.sql                   |  33 ---
 basemap/layers/point/create.sql                    | 130 ++++++++-
 basemap/layers/point/refresh.sql                   | 143 ----------
 basemap/layers/railway/create.sql                  | 150 +++++++++--
 basemap/layers/railway/refresh.sql                 | 163 ------------
 basemap/layers/relation/create.sql                 |  18 +-
 basemap/layers/relation/refresh.sql                |  29 --
 basemap/layers/route/create.sql                    | 150 +++++++++--
 basemap/layers/route/refresh.sql                   | 163 ------------
 basemap/layers/waterway/create.sql                 | 150 +++++++++--
 basemap/layers/waterway/refresh.sql                | 163 ------------
 basemap/layers/way/create.sql                      |  16 ++
 basemap/layers/way/refresh.sql                     |  29 --
 basemap/refresh.js                                 |  26 +-
 35 files changed, 2251 insertions(+), 2265 deletions(-)

diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tasks/RefreshMaterializedViews.java b/baremaps-core/src/main/java/org/apache/baremaps/tasks/RefreshMaterializedViews.java
new file mode 100644
index 000000000..726adefd1
--- /dev/null
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tasks/RefreshMaterializedViews.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.baremaps.tasks;
+
+import java.sql.SQLException;
+import javax.sql.DataSource;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever;
+import org.apache.baremaps.postgres.refresh.DependencyGraphBuilder;
+import org.apache.baremaps.postgres.refresh.MaterializedViewRefresher;
+import org.apache.baremaps.workflow.Task;
+import org.apache.baremaps.workflow.WorkflowContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RefreshMaterializedViews implements Task {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(RefreshMaterializedViews.class);
+
+  private Object database;
+
+  public RefreshMaterializedViews() {
+    // Default constructor
+  }
+
+  public RefreshMaterializedViews(Object database) {
+    this.database = database;
+  }
+
+  @Override
+  public void execute(WorkflowContext context) throws Exception {
+    DataSource dataSource = context.getDataSource(database);
+    try (var connection = dataSource.getConnection()) {
+      LOGGER.info("Connected to PostgreSQL database.");
+
+      // Get the schema of the database.
+      var schema = connection.getSchema();
+
+      // Retrieve database objects (tables, views, materialized views).
+      var objects = DatabaseMetadataRetriever.getObjects(connection, schema);
+
+      // Retrieve dependencies between database objects.
+      var dependencies = DatabaseMetadataRetriever.getDependencies(connection, schema, objects);
+
+      // Build a directed graph of dependencies between the database objects.
+      var graph = DependencyGraphBuilder.buildGraph(objects, dependencies);
+
+      // Perform a topological sort so that dependencies come before dependents.
+      var sorted = DependencyGraphBuilder.topologicalSort(graph);
+
+      // Refresh materialized views, dropping and recreating indexes if present.
+      MaterializedViewRefresher.refreshMaterializedViews(connection, sorted);
+
+      LOGGER.info("Done refreshing materialized views.");
+    } catch (SQLException ex) {
+      LOGGER.error("Database error", ex);
+    }
+  }
+}
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java b/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
index 0f3920b92..d9410e639 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/workflow/Task.java
@@ -52,6 +52,7 @@ import org.apache.baremaps.tasks.*;
     @Type(value = ImportOsmPbf.class, name = "ImportOsmPbf"),
     @Type(value = ImportShapefile.class, name = "ImportShapefile"),
     @Type(value = LogMessage.class, name = "LogMessage"),
+    @Type(value = RefreshMaterializedViews.class, name = "RefreshMaterializedViews"),
     @Type(value = UpdateOsmDatabase.class, name = "UpdateOsmDatabase"),
 })
 public interface Task {
diff --git a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DatabaseMetadataRetriever.java b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DatabaseMetadataRetriever.java
new file mode 100644
index 000000000..69de72ec2
--- /dev/null
+++ b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DatabaseMetadataRetriever.java
@@ -0,0 +1,220 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.baremaps.postgres.refresh;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility class to retrieve metadata about tables, views, and materialized views.
+ */
+public class DatabaseMetadataRetriever {
+
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(DatabaseMetadataRetriever.class.getName());
+
+  private DatabaseMetadataRetriever() {
+    // Prevent instantiation
+  }
+
+  /**
+   * Retrieves all tables, views, and materialized views in the given schema.
+   *
+   * @param connection the database connection
+   * @param schema the schema name
+   * @return a list of DatabaseObject records
+   * @throws SQLException if a database error occurs
+   */
+  public static List<DatabaseObject> getObjects(Connection connection, String schema)
+      throws SQLException {
+    var result = new ArrayList<DatabaseObject>();
+
+    var sql = """
+            SELECT c.oid,
+                   c.relname,
+                   c.relkind,
+                   n.nspname
+              FROM pg_class c
+              JOIN pg_namespace n ON n.oid = c.relnamespace
+             WHERE n.nspname = ?
+               AND c.relkind IN ('r', 'v', 'm')
+        """;
+
+    try (var ps = connection.prepareStatement(sql)) {
+      ps.setString(1, schema);
+      try (var rs = ps.executeQuery()) {
+        while (rs.next()) {
+          var oid = rs.getLong("oid");
+          var relName = rs.getString("relname");
+          var relKind = rs.getString("relkind");
+          var nspName = rs.getString("nspname");
+
+          var objectType = switch (relKind) {
+            case "r" -> ObjectType.TABLE;
+            case "v" -> ObjectType.VIEW;
+            case "m" -> ObjectType.MATERIALIZED_VIEW;
+            default -> null;
+          };
+
+          var dbObj = new DatabaseObject(nspName, relName, objectType);
+          result.add(dbObj);
+        }
+      }
+    }
+
+    LOGGER.info("Found " + result.size() + " objects in schema " + schema);
+    return result;
+  }
+
+  /**
+   * Retrieves dependencies between database objects in the given schema.
+   *
+   * @param connection the database connection
+   * @param schema the schema name
+   * @param objects a list of database objects
+   * @return a list of DatabaseDependency records
+   * @throws SQLException if a database error occurs
+   */
+  public static List<DatabaseDependency> getDependencies(Connection connection, String schema,
+      List<DatabaseObject> objects) throws SQLException {
+    var sql = """
+            SELECT dependent_ns.nspname   AS dependent_schema,
+                   dependent_c.relname    AS dependent_name,
+                   source_ns.nspname      AS source_schema,
+                   source_c.relname       AS source_name
+              FROM pg_depend d
+              JOIN pg_rewrite r
+                ON r.oid = d.objid
+              JOIN pg_class dependent_c
+                ON r.ev_class = dependent_c.oid
+              JOIN pg_namespace dependent_ns
+                ON dependent_c.relnamespace = dependent_ns.oid
+              JOIN pg_class source_c
+                ON d.refobjid = source_c.oid
+              JOIN pg_namespace source_ns
+                ON source_c.relnamespace = source_ns.oid
+             WHERE dependent_ns.nspname = ?
+               AND source_ns.nspname = ?
+        """;
+
+    // Create a fast lookup by (schema + name).
+    var lookupMap = new HashMap<String, DatabaseObject>();
+    for (var obj : objects) {
+      var key = obj.schemaName() + "." + obj.objectName();
+      lookupMap.put(key, obj);
+    }
+
+    var result = new ArrayList<DatabaseDependency>();
+    try (var ps = connection.prepareStatement(sql)) {
+      ps.setString(1, schema);
+      ps.setString(2, schema);
+      try (var rs = ps.executeQuery()) {
+        while (rs.next()) {
+          var dependentSchema = rs.getString("dependent_schema");
+          var dependentName = rs.getString("dependent_name");
+          var sourceSchema = rs.getString("source_schema");
+          var sourceName = rs.getString("source_name");
+
+          var dependentKey = dependentSchema + "." + dependentName;
+          var sourceKey = sourceSchema + "." + sourceName;
+
+          var dependentObj = lookupMap.get(dependentKey);
+          var sourceObj = lookupMap.get(sourceKey);
+
+          if (dependentObj != null && sourceObj != null) {
+            // Skip self-loop dependencies.
+            if (!dependentObj.equals(sourceObj)) {
+              result.add(new DatabaseDependency(sourceObj, dependentObj));
+            }
+          }
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Retrieves indexes for the given table or materialized view.
+   *
+   * @param connection the database connection
+   * @param schema the schema name
+   * @param tableName the table or materialized view name
+   * @return a list of DatabaseIndex records
+   * @throws SQLException if a database error occurs
+   */
+  public static List<DatabaseIndex> getIndexes(Connection connection, String schema,
+      String tableName) throws SQLException {
+    var sql = """
+            SELECT indexname, indexdef
+              FROM pg_indexes
+             WHERE schemaname = ?
+               AND tablename  = ?
+        """;
+
+    var result = new ArrayList<DatabaseIndex>();
+    try (var ps = connection.prepareStatement(sql)) {
+      ps.setString(1, schema);
+      ps.setString(2, tableName);
+      try (var rs = ps.executeQuery()) {
+        while (rs.next()) {
+          var indexName = rs.getString("indexname");
+          var indexDef = rs.getString("indexdef");
+          result.add(new DatabaseIndex(indexName, indexDef));
+        }
+      }
+    }
+    return result;
+  }
+
+  /**
+   * Represents the type of database object.
+   */
+  public enum ObjectType {
+    TABLE,
+    VIEW,
+    MATERIALIZED_VIEW
+  }
+
+  /**
+   * A record representing a database object (table, view, materialized view).
+   */
+  public record DatabaseObject(
+      String schemaName,
+      String objectName,
+      ObjectType objectType) {
+  }
+
+  /**
+   * Record representing a dependency between two database objects.
+   */
+  public record DatabaseDependency(DatabaseObject source, DatabaseObject dependent) {
+  }
+
+
+  /**
+   * Record representing a database index.
+   */
+  public record DatabaseIndex(String indexName, String indexDef) {
+  }
+
+}
diff --git a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DependencyGraphBuilder.java b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DependencyGraphBuilder.java
new file mode 100644
index 000000000..084d3a4d3
--- /dev/null
+++ b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/DependencyGraphBuilder.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.baremaps.postgres.refresh;
+
+import com.google.common.graph.GraphBuilder;
+import com.google.common.graph.MutableGraph;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseDependency;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility class to build a directed dependency graph among DatabaseObject items.
+ */
+public class DependencyGraphBuilder {
+
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(DependencyGraphBuilder.class.getName());
+
+  private DependencyGraphBuilder() {
+    // Prevent instantiation
+  }
+
+  /**
+   * Builds a directed graph using Guava for the given list of objects, then populates edges from
+   * system catalogs.
+   *
+   * @param objects a list of database objects
+   * @param dependencies a list of database dependencies
+   * @return a directed graph of database objects and dependencies
+   */
+  public static MutableGraph<DatabaseObject> buildGraph(
+      List<DatabaseObject> objects,
+      List<DatabaseDependency> dependencies) throws SQLException {
+
+    // Build a directed graph
+    MutableGraph<DatabaseObject> graph = GraphBuilder
+        .directed()
+        .allowsSelfLoops(false)
+        .build();
+
+    // Add nodes for objects
+    objects.forEach(graph::addNode);
+
+    // Add edges for dependencies
+    dependencies.forEach(dep -> graph.putEdge(dep.source(), dep.dependent()));
+
+    return graph;
+  }
+
+  /**
+   * Performs a topological sort of the given graph using Kahn's algorithm, so that dependencies
+   * appear before their dependents.
+   *
+   * @param graph a directed graph of database objects
+   * @return a list of database objects in topological order
+   */
+  public static List<DatabaseObject> topologicalSort(MutableGraph<DatabaseObject> graph) {
+    var inDegree = new HashMap<DatabaseObject, Integer>();
+    for (var node : graph.nodes()) {
+      inDegree.put(node, 0);
+    }
+
+    for (var node : graph.nodes()) {
+      for (var successor : graph.successors(node)) {
+        inDegree.compute(successor, (k, v) -> v == null ? 1 : v + 1);
+      }
+    }
+
+    var queue = new LinkedList<DatabaseObject>();
+    for (var entry : inDegree.entrySet()) {
+      if (entry.getValue() == 0) {
+        queue.add(entry.getKey());
+      }
+    }
+
+    var result = new ArrayList<DatabaseObject>();
+    while (!queue.isEmpty()) {
+      var current = queue.poll();
+      result.add(current);
+      for (var succ : graph.successors(current)) {
+        var newVal = inDegree.get(succ) - 1;
+        inDegree.put(succ, newVal);
+        if (newVal == 0) {
+          queue.add(succ);
+        }
+      }
+    }
+
+    return result;
+  }
+
+}
diff --git a/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/MaterializedViewRefresher.java b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/MaterializedViewRefresher.java
new file mode 100644
index 000000000..7d7aa1240
--- /dev/null
+++ b/baremaps-postgres/src/main/java/org/apache/baremaps/postgres/refresh/MaterializedViewRefresher.java
@@ -0,0 +1,97 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.baremaps.postgres.refresh;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseIndex;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.DatabaseObject;
+import org.apache.baremaps.postgres.refresh.DatabaseMetadataRetriever.ObjectType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Utility class to refresh materialized views in topological order: 1) drop indexes, 2) refresh MV,
+ * 3) recreate indexes.
+ */
+public class MaterializedViewRefresher {
+
+  private static final Logger LOGGER =
+      LoggerFactory.getLogger(MaterializedViewRefresher.class.getName());
+
+  private MaterializedViewRefresher() {
+    // Prevent instantiation
+  }
+
+  /**
+   * Traverse the sorted objects. When we hit a materialized view, drop its indexes, refresh it, and
+   * recreate indexes.
+   */
+  public static void refreshMaterializedViews(Connection connection,
+      List<DatabaseObject> sortedObjects) {
+    for (var obj : sortedObjects) {
+      if (obj.objectType() == ObjectType.MATERIALIZED_VIEW) {
+        LOGGER.info("Refreshing materialized view: " + obj.schemaName() + "." + obj.objectName());
+        try {
+          var indexes =
+              DatabaseMetadataRetriever.getIndexes(connection, obj.schemaName(), obj.objectName());
+          dropIndexes(connection, indexes);
+          refreshMaterializedView(connection, obj);
+          recreateIndexes(connection, indexes);
+        } catch (SQLException ex) {
+          LOGGER.error("Error refreshing materialized view: " +
+              obj.schemaName() + "." + obj.objectName(), ex);
+        }
+      }
+    }
+  }
+
+  private static void dropIndexes(Connection connection, List<DatabaseIndex> indexes)
+      throws SQLException {
+    for (var idx : indexes) {
+      LOGGER.info("Dropping index: " + idx.indexName());
+      try (var st = connection.createStatement()) {
+        var dropSql = String.format(
+            "DROP INDEX IF EXISTS %s",
+            idx.indexName());
+        st.execute(dropSql);
+      }
+    }
+  }
+
+  private static void refreshMaterializedView(Connection connection, DatabaseObject mv)
+      throws SQLException {
+    var refreshSql = String.format(
+        "REFRESH MATERIALIZED VIEW %s WITH DATA",
+        mv.objectName());
+    try (var st = connection.createStatement()) {
+      st.execute(refreshSql);
+    }
+  }
+
+  private static void recreateIndexes(Connection connection, List<DatabaseIndex> indexes)
+      throws SQLException {
+    for (var idx : indexes) {
+      LOGGER.info("Recreating index: " + idx.indexName());
+      try (var st = connection.createStatement()) {
+        st.execute(idx.indexDef());
+      }
+    }
+  }
+}
diff --git a/basemap/create.js b/basemap/create.js
index c2b85a335..e3e489ae9 100644
--- a/basemap/create.js
+++ b/basemap/create.js
@@ -19,7 +19,7 @@ import config from "./config.js";
 export default {
     "steps": [
         {
-            "id": "openstreetmap-water-polygons",
+            "id": "create",
             "needs": [],
             "tasks": [
                 // Initialization
diff --git a/basemap/layers/amenity/create.sql b/basemap/layers/amenity/create.sql
index d3020cb4c..8388b5adc 100644
--- a/basemap/layers/amenity/create.sql
+++ b/basemap/layers/amenity/create.sql
@@ -118,7 +118,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z12_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z12_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z12_filtered_geom_idx ON
+    osm_amenity_z12_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z12_filtered_tags_idx ON
+    osm_amenity_z12_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_amenity_z12 CASCADE;
@@ -163,7 +178,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z12_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z12_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z12_geom_idx ON
+    osm_amenity_z12
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z12_tags_idx ON
+    osm_amenity_z12
+        USING GIN(tags);
 
 -- Zoom level 11
 DROP
@@ -185,7 +216,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z11_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z11_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z11_filtered_geom_idx ON
+    osm_amenity_z11_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z11_filtered_tags_idx ON
+    osm_amenity_z11_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_amenity_z11 CASCADE;
@@ -230,7 +276,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z11_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z11_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z11_geom_idx ON
+    osm_amenity_z11
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z11_tags_idx ON
+    osm_amenity_z11
+        USING GIN(tags);
 
 -- Zoom level 10
 DROP
@@ -252,7 +314,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z10_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z10_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z10_filtered_geom_idx ON
+    osm_amenity_z10_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z10_filtered_tags_idx ON
+    osm_amenity_z10_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_amenity_z10 CASCADE;
@@ -297,7 +374,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z10_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z10_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z10_geom_idx ON
+    osm_amenity_z10
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z10_tags_idx ON
+    osm_amenity_z10
+        USING GIN(tags);
 
 -- Zoom level 9
 DROP
@@ -361,7 +454,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 9 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z9_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z9_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z9_geom_idx ON
+    osm_amenity_z9
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z9_tags_idx ON
+    osm_amenity_z9
+        USING GIN(tags);
 
 -- Zoom level 8
 DROP
@@ -425,7 +534,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 8 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z8_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z8_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z8_geom_idx ON
+    osm_amenity_z8
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z8_tags_idx ON
+    osm_amenity_z8
+        USING GIN(tags);
 
 -- Zoom level 7
 DROP
@@ -489,7 +614,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 7 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z7_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z7_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z7_geom_idx ON
+    osm_amenity_z7
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z7_tags_idx ON
+    osm_amenity_z7
+        USING GIN(tags);
 
 -- Zoom level 6
 DROP
@@ -553,7 +694,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 6 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z6_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z6_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z6_geom_idx ON
+    osm_amenity_z6
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z6_tags_idx ON
+    osm_amenity_z6
+        USING GIN(tags);
 
 -- Zoom level 5
 DROP
@@ -617,7 +774,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 5 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z5_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z5_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z5_geom_idx ON
+    osm_amenity_z5
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z5_tags_idx ON
+    osm_amenity_z5
+        USING GIN(tags);
 
 -- Zoom level 4
 DROP
@@ -681,7 +854,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 4 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z4_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z4_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z4_geom_idx ON
+    osm_amenity_z4
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z4_tags_idx ON
+    osm_amenity_z4
+        USING GIN(tags);
 
 -- Zoom level 3
 DROP
@@ -700,7 +889,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z3_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z3_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z3_geom_idx ON
+    osm_amenity_z3
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z3_tags_idx ON
+    osm_amenity_z3
+        USING GIN(tags);
 
 -- Zoom level 2
 DROP
@@ -719,7 +924,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z2_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z2_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z2_geom_idx ON
+    osm_amenity_z2
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z2_tags_idx ON
+    osm_amenity_z2
+        USING GIN(tags);
 
 -- Zoom level 1
 DROP
@@ -738,4 +959,20 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z1_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_amenity_z1_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z1_geom_idx ON
+    osm_amenity_z1
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_amenity_z1_tags_idx ON
+    osm_amenity_z1
+        USING GIN(tags);
diff --git a/basemap/layers/amenity/refresh.sql b/basemap/layers/amenity/refresh.sql
deleted file mode 100644
index c3a4b305e..000000000
--- a/basemap/layers/amenity/refresh.sql
+++ /dev/null
@@ -1,292 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- Zoom level 12
-DROP
-    INDEX IF EXISTS osm_amenity_z12_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z12_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z12_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z12_filtered_geom_idx ON
-    osm_amenity_z12_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z12_filtered_tags_idx ON
-    osm_amenity_z12_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_amenity_z12_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z12_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z12_geom_idx ON
-    osm_amenity_z12
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z12_tags_idx ON
-    osm_amenity_z12
-        USING GIN(tags);
-
--- Zoom level 11
-DROP
-    INDEX IF EXISTS osm_amenity_z11_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z11_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z11_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z11_filtered_geom_idx ON
-    osm_amenity_z11_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z11_filtered_tags_idx ON
-    osm_amenity_z11_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_amenity_z11_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z11_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z11_geom_idx ON
-    osm_amenity_z11
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z11_tags_idx ON
-    osm_amenity_z11
-        USING GIN(tags);
-
--- Zoom level 10
-DROP
-    INDEX IF EXISTS osm_amenity_z10_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z10_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z10_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z10_filtered_geom_idx ON
-    osm_amenity_z10_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z10_filtered_tags_idx ON
-    osm_amenity_z10_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_amenity_z10_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z10_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z10_geom_idx ON
-    osm_amenity_z10
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z10_tags_idx ON
-    osm_amenity_z10
-        USING GIN(tags);
-
--- Zoom level 9
-DROP
-    INDEX IF EXISTS osm_amenity_z9_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z9_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z9_geom_idx ON
-    osm_amenity_z9
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z9_tags_idx ON
-    osm_amenity_z9
-        USING GIN(tags);
-
--- Zoom level 8
-DROP
-    INDEX IF EXISTS osm_amenity_z8_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z8_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z8_geom_idx ON
-    osm_amenity_z8
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z8_tags_idx ON
-    osm_amenity_z8
-        USING GIN(tags);
-
--- Zoom level 7
-DROP
-    INDEX IF EXISTS osm_amenity_z7_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z7_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z7_geom_idx ON
-    osm_amenity_z7
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z7_tags_idx ON
-    osm_amenity_z7
-        USING GIN(tags);
-
--- Zoom level 6
-DROP
-    INDEX IF EXISTS osm_amenity_z6_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z6_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z6_geom_idx ON
-    osm_amenity_z6
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z6_tags_idx ON
-    osm_amenity_z6
-        USING GIN(tags);
-
--- Zoom level 5
-DROP
-    INDEX IF EXISTS osm_amenity_z5_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z5_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z5_geom_idx ON
-    osm_amenity_z5
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z5_tags_idx ON
-    osm_amenity_z5
-        USING GIN(tags);
-
--- Zoom level 4
-DROP
-    INDEX IF EXISTS osm_amenity_z4_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z4_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z4_geom_idx ON
-    osm_amenity_z4
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z4_tags_idx ON
-    osm_amenity_z4
-        USING GIN(tags);
-
--- Zoom level 3
-DROP
-    INDEX IF EXISTS osm_amenity_z3_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z3_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z3_geom_idx ON
-    osm_amenity_z3
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z3_tags_idx ON
-    osm_amenity_z3
-        USING GIN(tags);
-
--- Zoom level 2
-DROP
-    INDEX IF EXISTS osm_amenity_z2_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z2_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z2_geom_idx ON
-    osm_amenity_z2
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z2_tags_idx ON
-    osm_amenity_z2
-        USING GIN(tags);
-
--- Zoom level 1
-DROP
-    INDEX IF EXISTS osm_amenity_z1_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_amenity_z1_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_amenity_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z1_geom_idx ON
-    osm_amenity_z1
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_amenity_z1_tags_idx ON
-    osm_amenity_z1
-        USING GIN(tags);
diff --git a/basemap/layers/highway/create.sql b/basemap/layers/highway/create.sql
index 42d85abce..26078979f 100644
--- a/basemap/layers/highway/create.sql
+++ b/basemap/layers/highway/create.sql
@@ -126,7 +126,15 @@ CREATE
             'tertiary_link',
             'unclassified',
             'residential'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_filtered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_filtered_geom ON
+    osm_highway_filtered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_clustered CASCADE;
@@ -143,7 +151,15 @@ CREATE
             PARTITION BY highway
         ) AS cluster
     FROM
-        osm_highway_filtered WITH NO DATA;
+        osm_highway_filtered;
+
+DROP
+    INDEX IF EXISTS osm_highway_clustered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_clustered_geom ON
+    osm_highway_clustered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_simplified CASCADE;
@@ -177,7 +193,15 @@ CREATE
         ) AS tags,
         geom AS geom
     FROM
-        exploded WITH NO DATA;
+        exploded;
+
+DROP
+    INDEX IF EXISTS osm_highway_simplified_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_simplified_geom ON
+    osm_highway_simplified
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z12 CASCADE;
@@ -199,7 +223,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 12 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z12_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z12_geom_idx ON
+    osm_highway_z12
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z11 CASCADE;
@@ -235,7 +267,15 @@ CREATE
             'tertiary_link',
             'unclassified',
             'residential'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z11_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z11_geom_idx ON
+    osm_highway_z11
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z10 CASCADE;
@@ -269,7 +309,15 @@ CREATE
             'secondary_link',
             'tertiary',
             'tertiary_link'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z10_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z10_geom_idx ON
+    osm_highway_z10
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z9 CASCADE;
@@ -301,7 +349,15 @@ CREATE
             'primary_link',
             'secondary',
             'secondary_link'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z9_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z9_geom_idx ON
+    osm_highway_z9
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z8 CASCADE;
@@ -328,7 +384,15 @@ CREATE
             'motorway',
             'trunk',
             'primary'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z8_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z8_geom_idx ON
+    osm_highway_z8
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z7 CASCADE;
@@ -355,7 +419,15 @@ CREATE
             'motorway',
             'trunk',
             'primary'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z7_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z7_geom_idx ON
+    osm_highway_z7
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z6 CASCADE;
@@ -382,7 +454,15 @@ CREATE
             'motorway',
             'trunk',
             'primary'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_highway_z6_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z6_geom_idx ON
+    osm_highway_z6
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z5 CASCADE;
@@ -405,7 +485,15 @@ CREATE
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 5 )), 2 )
         )
-        AND tags ->> 'highway' IN('motorway') WITH NO DATA;
+        AND tags ->> 'highway' IN('motorway');
+
+DROP
+    INDEX IF EXISTS osm_highway_z5_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z5_geom_idx ON
+    osm_highway_z5
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z4 CASCADE;
@@ -428,7 +516,15 @@ CREATE
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 4 )), 2 )
         )
-        AND tags ->> 'highway' IN('motorway') WITH NO DATA;
+        AND tags ->> 'highway' IN('motorway');
+
+DROP
+    INDEX IF EXISTS osm_highway_z4_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z4_geom_idx ON
+    osm_highway_z4
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z3 CASCADE;
@@ -451,7 +547,15 @@ CREATE
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 3 )), 2 )
         )
-        AND tags ->> 'highway' IN('motorway') WITH NO DATA;
+        AND tags ->> 'highway' IN('motorway');
+
+DROP
+    INDEX IF EXISTS osm_highway_z3_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z3_geom_idx ON
+    osm_highway_z3
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z2 CASCADE;
@@ -474,7 +578,15 @@ CREATE
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 2 )), 2 )
         )
-        AND tags ->> 'highway' IN('motorway') WITH NO DATA;
+        AND tags ->> 'highway' IN('motorway');
+
+DROP
+    INDEX IF EXISTS osm_highway_z2_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z2_geom_idx ON
+    osm_highway_z2
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_highway_z1 CASCADE;
@@ -497,4 +609,12 @@ CREATE
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 1 )), 2 )
         )
-        AND tags ->> 'highway' IN('motorway') WITH NO DATA;
+        AND tags ->> 'highway' IN('motorway');
+
+DROP
+    INDEX IF EXISTS osm_highway_z1_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_highway_z1_geom_idx ON
+    osm_highway_z1
+        USING GIST(geom);
diff --git a/basemap/layers/highway/refresh.sql b/basemap/layers/highway/refresh.sql
deleted file mode 100644
index 38e7e4e20..000000000
--- a/basemap/layers/highway/refresh.sql
+++ /dev/null
@@ -1,163 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_highway_filtered_geom;
-
-REFRESH MATERIALIZED VIEW osm_highway_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_filtered_geom ON
-    osm_highway_filtered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_clustered_geom;
-
-REFRESH MATERIALIZED VIEW osm_highway_clustered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_clustered_geom ON
-    osm_highway_clustered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_simplified_geom;
-
-REFRESH MATERIALIZED VIEW osm_highway_simplified;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_simplified_geom ON
-    osm_highway_simplified
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z12_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z12_geom_idx ON
-    osm_highway_z12
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z11_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z11_geom_idx ON
-    osm_highway_z11
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z10_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z10_geom_idx ON
-    osm_highway_z10
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z9_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z9_geom_idx ON
-    osm_highway_z9
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z8_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z8_geom_idx ON
-    osm_highway_z8
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z7_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z7_geom_idx ON
-    osm_highway_z7
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z6_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z6_geom_idx ON
-    osm_highway_z6
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z5_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z5_geom_idx ON
-    osm_highway_z5
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z4_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z4_geom_idx ON
-    osm_highway_z4
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z3_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z3_geom_idx ON
-    osm_highway_z3
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z2_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z2_geom_idx ON
-    osm_highway_z2
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_highway_z1_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_highway_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_highway_z1_geom_idx ON
-    osm_highway_z1
-        USING GIST(geom);
diff --git a/basemap/layers/landuse/create.sql b/basemap/layers/landuse/create.sql
index b7ebf65ee..a15bfeaea 100644
--- a/basemap/layers/landuse/create.sql
+++ b/basemap/layers/landuse/create.sql
@@ -142,7 +142,22 @@ CREATE
             'landfill',
             'quarry',
             'railway'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_landuse_z12_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z12_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z12_filtered_geom_idx ON
+    osm_landuse_z12_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z12_filtered_tags_idx ON
+    osm_landuse_z12_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_landuse_z12 CASCADE;
@@ -187,7 +202,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z12_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z12_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z12_geom_idx ON
+    osm_landuse_z12
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z12_tags_idx ON
+    osm_landuse_z12
+        USING GIN(tags);
 
 -- Zoom level 11
 DROP
@@ -209,7 +240,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z11_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z11_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z11_filtered_geom_idx ON
+    osm_landuse_z11_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z11_filtered_tags_idx ON
+    osm_landuse_z11_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_landuse_z11 CASCADE;
@@ -254,7 +300,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z11_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z11_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z11_geom_idx ON
+    osm_landuse_z11
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z11_tags_idx ON
+    osm_landuse_z11
+        USING GIN(tags);
 
 -- Zoom level 10
 DROP
@@ -276,7 +338,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z10_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z10_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z10_filtered_geom_idx ON
+    osm_landuse_z10_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z10_filtered_tags_idx ON
+    osm_landuse_z10_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_landuse_z10 CASCADE;
@@ -321,7 +398,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z10_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z10_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z10_geom_idx ON
+    osm_landuse_z10
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z10_tags_idx ON
+    osm_landuse_z10
+        USING GIN(tags);
 
 -- Zoom level 9
 DROP
@@ -385,7 +478,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 9 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z9_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z9_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z9_geom_idx ON
+    osm_landuse_z9
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z9_tags_idx ON
+    osm_landuse_z9
+        USING GIN(tags);
 
 -- Zoom level 8
 DROP
@@ -449,7 +558,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 8 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z8_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z8_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z8_geom_idx ON
+    osm_landuse_z8
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z8_tags_idx ON
+    osm_landuse_z8
+        USING GIN(tags);
 
 -- Zoom level 7
 DROP
@@ -513,7 +638,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 7 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z7_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z7_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z7_geom_idx ON
+    osm_landuse_z7
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z7_tags_idx ON
+    osm_landuse_z7
+        USING GIN(tags);
 
 -- Zoom level 6
 DROP
@@ -577,7 +718,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 6 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z6_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z6_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z6_geom_idx ON
+    osm_landuse_z6
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z6_tags_idx ON
+    osm_landuse_z6
+        USING GIN(tags);
 
 -- Zoom level 5
 DROP
@@ -641,7 +798,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 5 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z5_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z5_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z5_geom_idx ON
+    osm_landuse_z5
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z5_tags_idx ON
+    osm_landuse_z5
+        USING GIN(tags);
 
 -- Zoom level 4
 DROP
@@ -705,7 +878,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 4 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z4_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z4_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z4_geom_idx ON
+    osm_landuse_z4
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z4_tags_idx ON
+    osm_landuse_z4
+        USING GIN(tags);
 
 -- Zoom level 3
 DROP
@@ -724,7 +913,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z3_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z3_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z3_geom_idx ON
+    osm_landuse_z3
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z3_tags_idx ON
+    osm_landuse_z3
+        USING GIN(tags);
 
 -- Zoom level 2
 DROP
@@ -743,7 +948,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z2_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z2_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z2_geom_idx ON
+    osm_landuse_z2
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z2_tags_idx ON
+    osm_landuse_z2
+        USING GIN(tags);
 
 -- Zoom level 1
 DROP
@@ -762,4 +983,20 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z1_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_landuse_z1_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z1_geom_idx ON
+    osm_landuse_z1
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_landuse_z1_tags_idx ON
+    osm_landuse_z1
+        USING GIN(tags);
diff --git a/basemap/layers/landuse/refresh.sql b/basemap/layers/landuse/refresh.sql
deleted file mode 100644
index 91511261b..000000000
--- a/basemap/layers/landuse/refresh.sql
+++ /dev/null
@@ -1,292 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- Zoom level 12
-DROP
-    INDEX IF EXISTS osm_landuse_z12_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z12_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z12_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z12_filtered_geom_idx ON
-    osm_landuse_z12_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z12_filtered_tags_idx ON
-    osm_landuse_z12_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_landuse_z12_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z12_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z12_geom_idx ON
-    osm_landuse_z12
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z12_tags_idx ON
-    osm_landuse_z12
-        USING GIN(tags);
-
--- Zoom level 11
-DROP
-    INDEX IF EXISTS osm_landuse_z11_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z11_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z11_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z11_filtered_geom_idx ON
-    osm_landuse_z11_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z11_filtered_tags_idx ON
-    osm_landuse_z11_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_landuse_z11_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z11_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z11_geom_idx ON
-    osm_landuse_z11
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z11_tags_idx ON
-    osm_landuse_z11
-        USING GIN(tags);
-
--- Zoom level 10
-DROP
-    INDEX IF EXISTS osm_landuse_z10_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z10_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z10_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z10_filtered_geom_idx ON
-    osm_landuse_z10_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z10_filtered_tags_idx ON
-    osm_landuse_z10_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_landuse_z10_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z10_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z10_geom_idx ON
-    osm_landuse_z10
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z10_tags_idx ON
-    osm_landuse_z10
-        USING GIN(tags);
-
--- Zoom level 9
-DROP
-    INDEX IF EXISTS osm_landuse_z9_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z9_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z9_geom_idx ON
-    osm_landuse_z9
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z9_tags_idx ON
-    osm_landuse_z9
-        USING GIN(tags);
-
--- Zoom level 8
-DROP
-    INDEX IF EXISTS osm_landuse_z8_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z8_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z8_geom_idx ON
-    osm_landuse_z8
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z8_tags_idx ON
-    osm_landuse_z8
-        USING GIN(tags);
-
--- Zoom level 7
-DROP
-    INDEX IF EXISTS osm_landuse_z7_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z7_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z7_geom_idx ON
-    osm_landuse_z7
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z7_tags_idx ON
-    osm_landuse_z7
-        USING GIN(tags);
-
--- Zoom level 6
-DROP
-    INDEX IF EXISTS osm_landuse_z6_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z6_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z6_geom_idx ON
-    osm_landuse_z6
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z6_tags_idx ON
-    osm_landuse_z6
-        USING GIN(tags);
-
--- Zoom level 5
-DROP
-    INDEX IF EXISTS osm_landuse_z5_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z5_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z5_geom_idx ON
-    osm_landuse_z5
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z5_tags_idx ON
-    osm_landuse_z5
-        USING GIN(tags);
-
--- Zoom level 4
-DROP
-    INDEX IF EXISTS osm_landuse_z4_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z4_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z4_geom_idx ON
-    osm_landuse_z4
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z4_tags_idx ON
-    osm_landuse_z4
-        USING GIN(tags);
-
--- Zoom level 3
-DROP
-    INDEX IF EXISTS osm_landuse_z3_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z3_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z3_geom_idx ON
-    osm_landuse_z3
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z3_tags_idx ON
-    osm_landuse_z3
-        USING GIN(tags);
-
--- Zoom level 2
-DROP
-    INDEX IF EXISTS osm_landuse_z2_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z2_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z2_geom_idx ON
-    osm_landuse_z2
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z2_tags_idx ON
-    osm_landuse_z2
-        USING GIN(tags);
-
--- Zoom level 1
-DROP
-    INDEX IF EXISTS osm_landuse_z1_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_landuse_z1_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_landuse_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z1_geom_idx ON
-    osm_landuse_z1
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_landuse_z1_tags_idx ON
-    osm_landuse_z1
-        USING GIN(tags);
diff --git a/basemap/layers/leisure/create.sql b/basemap/layers/leisure/create.sql
index f0c348c63..5ba4c7601 100644
--- a/basemap/layers/leisure/create.sql
+++ b/basemap/layers/leisure/create.sql
@@ -127,7 +127,22 @@ CREATE
             'stadium',
             'swimming_pool',
             'track'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_leisure_z12_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z12_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z12_filtered_geom_idx ON
+    osm_leisure_z12_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z12_filtered_tags_idx ON
+    osm_leisure_z12_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_leisure_z12 CASCADE;
@@ -172,7 +187,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z12_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z12_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z12_geom_idx ON
+    osm_leisure_z12
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z12_tags_idx ON
+    osm_leisure_z12
+        USING GIN(tags);
 
 -- Zoom level 11
 DROP
@@ -194,7 +225,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z11_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z11_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z11_filtered_geom_idx ON
+    osm_leisure_z11_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z11_filtered_tags_idx ON
+    osm_leisure_z11_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_leisure_z11 CASCADE;
@@ -239,7 +285,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z11_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z11_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z11_geom_idx ON
+    osm_leisure_z11
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z11_tags_idx ON
+    osm_leisure_z11
+        USING GIN(tags);
 
 -- Zoom level 10
 DROP
@@ -261,7 +323,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z10_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z10_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z10_filtered_geom_idx ON
+    osm_leisure_z10_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z10_filtered_tags_idx ON
+    osm_leisure_z10_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_leisure_z10 CASCADE;
@@ -306,7 +383,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z10_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z10_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z10_geom_idx ON
+    osm_leisure_z10
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z10_tags_idx ON
+    osm_leisure_z10
+        USING GIN(tags);
 
 -- Zoom level 9
 DROP
@@ -370,7 +463,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 9 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z9_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z9_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z9_geom_idx ON
+    osm_leisure_z9
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z9_tags_idx ON
+    osm_leisure_z9
+        USING GIN(tags);
 
 -- Zoom level 8
 DROP
@@ -434,7 +543,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 8 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z8_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z8_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z8_geom_idx ON
+    osm_leisure_z8
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z8_tags_idx ON
+    osm_leisure_z8
+        USING GIN(tags);
 
 -- Zoom level 7
 DROP
@@ -498,7 +623,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 7 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z7_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z7_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z7_geom_idx ON
+    osm_leisure_z7
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z7_tags_idx ON
+    osm_leisure_z7
+        USING GIN(tags);
 
 -- Zoom level 6
 DROP
@@ -562,7 +703,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 6 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z6_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z6_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z6_geom_idx ON
+    osm_leisure_z6
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z6_tags_idx ON
+    osm_leisure_z6
+        USING GIN(tags);
 
 -- Zoom level 5
 DROP
@@ -626,7 +783,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 5 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z5_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z5_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z5_geom_idx ON
+    osm_leisure_z5
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z5_tags_idx ON
+    osm_leisure_z5
+        USING GIN(tags);
 
 -- Zoom level 4
 DROP
@@ -690,7 +863,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 4 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z4_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z4_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z4_geom_idx ON
+    osm_leisure_z4
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z4_tags_idx ON
+    osm_leisure_z4
+        USING GIN(tags);
 
 -- Zoom level 3
 DROP
@@ -709,7 +898,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z3_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z3_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z3_geom_idx ON
+    osm_leisure_z3
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z3_tags_idx ON
+    osm_leisure_z3
+        USING GIN(tags);
 
 -- Zoom level 2
 DROP
@@ -728,7 +933,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z2_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z2_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z2_geom_idx ON
+    osm_leisure_z2
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z2_tags_idx ON
+    osm_leisure_z2
+        USING GIN(tags);
 
 -- Zoom level 1
 DROP
@@ -747,4 +968,20 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z1_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_leisure_z1_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z1_geom_idx ON
+    osm_leisure_z1
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_leisure_z1_tags_idx ON
+    osm_leisure_z1
+        USING GIN(tags);
diff --git a/basemap/layers/leisure/refresh.sql b/basemap/layers/leisure/refresh.sql
deleted file mode 100644
index 847385834..000000000
--- a/basemap/layers/leisure/refresh.sql
+++ /dev/null
@@ -1,292 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- Zoom level 12
-DROP
-    INDEX IF EXISTS osm_leisure_z12_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z12_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z12_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z12_filtered_geom_idx ON
-    osm_leisure_z12_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z12_filtered_tags_idx ON
-    osm_leisure_z12_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_leisure_z12_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z12_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z12_geom_idx ON
-    osm_leisure_z12
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z12_tags_idx ON
-    osm_leisure_z12
-        USING GIN(tags);
-
--- Zoom level 11
-DROP
-    INDEX IF EXISTS osm_leisure_z11_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z11_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z11_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z11_filtered_geom_idx ON
-    osm_leisure_z11_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z11_filtered_tags_idx ON
-    osm_leisure_z11_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_leisure_z11_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z11_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z11_geom_idx ON
-    osm_leisure_z11
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z11_tags_idx ON
-    osm_leisure_z11
-        USING GIN(tags);
-
--- Zoom level 10
-DROP
-    INDEX IF EXISTS osm_leisure_z10_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z10_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z10_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z10_filtered_geom_idx ON
-    osm_leisure_z10_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z10_filtered_tags_idx ON
-    osm_leisure_z10_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_leisure_z10_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z10_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z10_geom_idx ON
-    osm_leisure_z10
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z10_tags_idx ON
-    osm_leisure_z10
-        USING GIN(tags);
-
--- Zoom level 9
-DROP
-    INDEX IF EXISTS osm_leisure_z9_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z9_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z9_geom_idx ON
-    osm_leisure_z9
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z9_tags_idx ON
-    osm_leisure_z9
-        USING GIN(tags);
-
--- Zoom level 8
-DROP
-    INDEX IF EXISTS osm_leisure_z8_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z8_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z8_geom_idx ON
-    osm_leisure_z8
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z8_tags_idx ON
-    osm_leisure_z8
-        USING GIN(tags);
-
--- Zoom level 7
-DROP
-    INDEX IF EXISTS osm_leisure_z7_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z7_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z7_geom_idx ON
-    osm_leisure_z7
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z7_tags_idx ON
-    osm_leisure_z7
-        USING GIN(tags);
-
--- Zoom level 6
-DROP
-    INDEX IF EXISTS osm_leisure_z6_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z6_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z6_geom_idx ON
-    osm_leisure_z6
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z6_tags_idx ON
-    osm_leisure_z6
-        USING GIN(tags);
-
--- Zoom level 5
-DROP
-    INDEX IF EXISTS osm_leisure_z5_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z5_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z5_geom_idx ON
-    osm_leisure_z5
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z5_tags_idx ON
-    osm_leisure_z5
-        USING GIN(tags);
-
--- Zoom level 4
-DROP
-    INDEX IF EXISTS osm_leisure_z4_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z4_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z4_geom_idx ON
-    osm_leisure_z4
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z4_tags_idx ON
-    osm_leisure_z4
-        USING GIN(tags);
-
--- Zoom level 3
-DROP
-    INDEX IF EXISTS osm_leisure_z3_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z3_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z3_geom_idx ON
-    osm_leisure_z3
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z3_tags_idx ON
-    osm_leisure_z3
-        USING GIN(tags);
-
--- Zoom level 2
-DROP
-    INDEX IF EXISTS osm_leisure_z2_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z2_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z2_geom_idx ON
-    osm_leisure_z2
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z2_tags_idx ON
-    osm_leisure_z2
-        USING GIN(tags);
-
--- Zoom level 1
-DROP
-    INDEX IF EXISTS osm_leisure_z1_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_leisure_z1_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_leisure_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z1_geom_idx ON
-    osm_leisure_z1
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_leisure_z1_tags_idx ON
-    osm_leisure_z1
-        USING GIN(tags);
diff --git a/basemap/layers/member/create.sql b/basemap/layers/member/create.sql
index ec0ab1bb6..c6a6a9c32 100644
--- a/basemap/layers/member/create.sql
+++ b/basemap/layers/member/create.sql
@@ -31,4 +31,11 @@ CREATE
         geom IS NOT NULL
         AND member_type = 1
         AND tags ->> 'type' = 'multipolygon'
-        AND NOT tags ->> 'natural' = 'coastline' WITH NO DATA;
\ No newline at end of file
+        AND NOT tags ->> 'natural' = 'coastline';
+
+DROP
+    INDEX IF EXISTS osm_member_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_member_idx ON
+    osm_member(member_ref);
\ No newline at end of file
diff --git a/basemap/layers/member/refresh.sql b/basemap/layers/member/refresh.sql
deleted file mode 100644
index 38e755998..000000000
--- a/basemap/layers/member/refresh.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_member_idx;
-
-REFRESH MATERIALIZED VIEW osm_member;
-
-CREATE
-    INDEX IF NOT EXISTS osm_member_idx ON
-    osm_member(member_ref);
\ No newline at end of file
diff --git a/basemap/layers/natural/create.sql b/basemap/layers/natural/create.sql
index 319adebd7..a34a889f2 100644
--- a/basemap/layers/natural/create.sql
+++ b/basemap/layers/natural/create.sql
@@ -133,7 +133,22 @@ CREATE
             'bare_rock',
             'sand',
             'scree'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_natural_z12_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z12_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z12_filtered_geom_idx ON
+    osm_natural_z12_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z12_filtered_tags_idx ON
+    osm_natural_z12_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_natural_z12 CASCADE;
@@ -178,7 +193,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 12 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z12_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z12_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z12_geom_idx ON
+    osm_natural_z12
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z12_tags_idx ON
+    osm_natural_z12
+        USING GIN(tags);
 
 -- Zoom level 11
 DROP
@@ -200,7 +231,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_natural_z11_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z11_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z11_filtered_geom_idx ON
+    osm_natural_z11_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z11_filtered_tags_idx ON
+    osm_natural_z11_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_natural_z11 CASCADE;
@@ -245,7 +291,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 11 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z11_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z11_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z11_geom_idx ON
+    osm_natural_z11
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z11_tags_idx ON
+    osm_natural_z11
+        USING GIN(tags);
 
 -- Zoom level 10
 DROP
@@ -267,7 +329,22 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32;
+
+DROP
+    INDEX IF EXISTS osm_natural_z10_filtered_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z10_filtered_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z10_filtered_geom_idx ON
+    osm_natural_z10_filtered
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z10_filtered_tags_idx ON
+    osm_natural_z10_filtered(tag);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_natural_z10 CASCADE;
@@ -312,7 +389,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 10 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z10_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z10_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z10_geom_idx ON
+    osm_natural_z10
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z10_tags_idx ON
+    osm_natural_z10
+        USING GIN(tags);
 
 -- Zoom level 9
 DROP
@@ -376,7 +469,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 9 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z9_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z9_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z9_geom_idx ON
+    osm_natural_z9
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z9_tags_idx ON
+    osm_natural_z9
+        USING GIN(tags);
 
 -- Zoom level 8
 DROP
@@ -440,7 +549,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 8 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z8_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z8_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z8_geom_idx ON
+    osm_natural_z8
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z8_tags_idx ON
+    osm_natural_z8
+        USING GIN(tags);
 
 -- Zoom level 7
 DROP
@@ -504,7 +629,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 7 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z7_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z7_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z7_geom_idx ON
+    osm_natural_z7
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z7_tags_idx ON
+    osm_natural_z7
+        USING GIN(tags);
 
 -- Zoom level 6
 DROP
@@ -568,7 +709,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 6 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z6_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z6_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z6_geom_idx ON
+    osm_natural_z6
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z6_tags_idx ON
+    osm_natural_z6
+        USING GIN(tags);
 
 -- Zoom level 5
 DROP
@@ -632,7 +789,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 5 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z5_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z5_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z5_geom_idx ON
+    osm_natural_z5
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z5_tags_idx ON
+    osm_natural_z5
+        USING GIN(tags);
 
 -- Zoom level 4
 DROP
@@ -696,7 +869,23 @@ CREATE
         AND st_area(geom)> POWER( 78270 / POWER( 2, 4 ), 2 )* 32
     GROUP BY
         tag,
-        cluster WITH NO DATA;
+        cluster;
+
+DROP
+    INDEX IF EXISTS osm_natural_z4_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z4_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z4_geom_idx ON
+    osm_natural_z4
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z4_tags_idx ON
+    osm_natural_z4
+        USING GIN(tags);
 
 -- Zoom level 3
 DROP
@@ -715,7 +904,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 3 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_natural_z3_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z3_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z3_geom_idx ON
+    osm_natural_z3
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z3_tags_idx ON
+    osm_natural_z3
+        USING GIN(tags);
 
 -- Zoom level 2
 DROP
@@ -734,7 +939,23 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 2 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_natural_z2_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z2_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z2_geom_idx ON
+    osm_natural_z2
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z2_tags_idx ON
+    osm_natural_z2
+        USING GIN(tags);
 
 -- Zoom level 1
 DROP
@@ -753,4 +974,20 @@ CREATE
     WHERE
         geom IS NOT NULL
         AND NOT ST_IsEmpty(geom)
-        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16 WITH NO DATA;
+        AND st_area(geom)> POWER( 78270 / POWER( 2, 1 ), 2 )* 16;
+
+DROP
+    INDEX IF EXISTS osm_natural_z1_geom_idx;
+
+DROP
+    INDEX IF EXISTS osm_natural_z1_tags_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z1_geom_idx ON
+    osm_natural_z1
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_natural_z1_tags_idx ON
+    osm_natural_z1
+        USING GIN(tags);
diff --git a/basemap/layers/natural/refresh.sql b/basemap/layers/natural/refresh.sql
deleted file mode 100644
index 4d61fd264..000000000
--- a/basemap/layers/natural/refresh.sql
+++ /dev/null
@@ -1,292 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- Zoom level 12
-DROP
-    INDEX IF EXISTS osm_natural_z12_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z12_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z12_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z12_filtered_geom_idx ON
-    osm_natural_z12_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z12_filtered_tags_idx ON
-    osm_natural_z12_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_natural_z12_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z12_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z12_geom_idx ON
-    osm_natural_z12
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z12_tags_idx ON
-    osm_natural_z12
-        USING GIN(tags);
-
--- Zoom level 11
-DROP
-    INDEX IF EXISTS osm_natural_z11_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z11_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z11_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z11_filtered_geom_idx ON
-    osm_natural_z11_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z11_filtered_tags_idx ON
-    osm_natural_z11_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_natural_z11_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z11_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z11_geom_idx ON
-    osm_natural_z11
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z11_tags_idx ON
-    osm_natural_z11
-        USING GIN(tags);
-
--- Zoom level 10
-DROP
-    INDEX IF EXISTS osm_natural_z10_filtered_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z10_filtered_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z10_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z10_filtered_geom_idx ON
-    osm_natural_z10_filtered
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z10_filtered_tags_idx ON
-    osm_natural_z10_filtered(tag);
-
-DROP
-    INDEX IF EXISTS osm_natural_z10_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z10_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z10_geom_idx ON
-    osm_natural_z10
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z10_tags_idx ON
-    osm_natural_z10
-        USING GIN(tags);
-
--- Zoom level 9
-DROP
-    INDEX IF EXISTS osm_natural_z9_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z9_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z9_geom_idx ON
-    osm_natural_z9
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z9_tags_idx ON
-    osm_natural_z9
-        USING GIN(tags);
-
--- Zoom level 8
-DROP
-    INDEX IF EXISTS osm_natural_z8_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z8_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z8_geom_idx ON
-    osm_natural_z8
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z8_tags_idx ON
-    osm_natural_z8
-        USING GIN(tags);
-
--- Zoom level 7
-DROP
-    INDEX IF EXISTS osm_natural_z7_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z7_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z7_geom_idx ON
-    osm_natural_z7
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z7_tags_idx ON
-    osm_natural_z7
-        USING GIN(tags);
-
--- Zoom level 6
-DROP
-    INDEX IF EXISTS osm_natural_z6_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z6_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z6_geom_idx ON
-    osm_natural_z6
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z6_tags_idx ON
-    osm_natural_z6
-        USING GIN(tags);
-
--- Zoom level 5
-DROP
-    INDEX IF EXISTS osm_natural_z5_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z5_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z5_geom_idx ON
-    osm_natural_z5
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z5_tags_idx ON
-    osm_natural_z5
-        USING GIN(tags);
-
--- Zoom level 4
-DROP
-    INDEX IF EXISTS osm_natural_z4_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z4_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z4_geom_idx ON
-    osm_natural_z4
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z4_tags_idx ON
-    osm_natural_z4
-        USING GIN(tags);
-
--- Zoom level 3
-DROP
-    INDEX IF EXISTS osm_natural_z3_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z3_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z3_geom_idx ON
-    osm_natural_z3
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z3_tags_idx ON
-    osm_natural_z3
-        USING GIN(tags);
-
--- Zoom level 2
-DROP
-    INDEX IF EXISTS osm_natural_z2_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z2_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z2_geom_idx ON
-    osm_natural_z2
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z2_tags_idx ON
-    osm_natural_z2
-        USING GIN(tags);
-
--- Zoom level 1
-DROP
-    INDEX IF EXISTS osm_natural_z1_geom_idx;
-
-DROP
-    INDEX IF EXISTS osm_natural_z1_tags_idx;
-
-REFRESH MATERIALIZED VIEW osm_natural_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z1_geom_idx ON
-    osm_natural_z1
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_natural_z1_tags_idx ON
-    osm_natural_z1
-        USING GIN(tags);
diff --git a/basemap/layers/node/create.sql b/basemap/layers/node/create.sql
index 58f50dc52..ffd5f63f1 100644
--- a/basemap/layers/node/create.sql
+++ b/basemap/layers/node/create.sql
@@ -28,4 +28,20 @@ CREATE
             lon FLOAT,
             lat FLOAT,
             geom geometry(point)
-        );
\ No newline at end of file
+        );
+
+DROP
+    INDEX IF EXISTS osm_node_geom_index;
+
+DROP
+    INDEX IF EXISTS osm_node_tags_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_node_geom_index ON
+    osm_node
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_node_tags_index ON
+    osm_node
+        USING GIN(tags);
diff --git a/basemap/layers/node/refresh.sql b/basemap/layers/node/refresh.sql
deleted file mode 100644
index 0c7db66fe..000000000
--- a/basemap/layers/node/refresh.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_node_geom_index;
-
-DROP
-    INDEX IF EXISTS osm_node_tags_index;
-
-CREATE
-    INDEX IF NOT EXISTS osm_node_geom_index ON
-    osm_node
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_node_tags_index ON
-    osm_node
-        USING GIN(tags);
diff --git a/basemap/layers/ocean/create.sql b/basemap/layers/ocean/create.sql
index df7732820..a581fcf8f 100644
--- a/basemap/layers/ocean/create.sql
+++ b/basemap/layers/ocean/create.sql
@@ -36,7 +36,15 @@ CREATE
             3857
         ) AS geom
     FROM
-        water_polygons_shp WITH NO DATA;
+        water_polygons_shp;
+
+DROP
+    INDEX IF EXISTS osm_ocean_geometry_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_ocean_geometry_index ON
+    osm_ocean
+        USING gist(geom);
 
 DROP
     TABLE
@@ -62,4 +70,12 @@ CREATE
             3857
         ) AS geom
     FROM
-        simplified_water_polygons_shp WITH NO DATA;
+        simplified_water_polygons_shp;
+
+DROP
+    INDEX IF EXISTS osm_ocean_simplified_geometry_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_ocean_simplified_geometry_index ON
+    osm_ocean_simplified
+        USING gist(geom);
\ No newline at end of file
diff --git a/basemap/layers/ocean/refresh.sql b/basemap/layers/ocean/refresh.sql
deleted file mode 100644
index b1476fd89..000000000
--- a/basemap/layers/ocean/refresh.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_ocean_geometry_index;
-
-REFRESH MATERIALIZED VIEW osm_ocean;
-
-CREATE
-    INDEX IF NOT EXISTS osm_ocean_geometry_index ON
-    osm_ocean
-        USING gist(geom);
-
-DROP
-    INDEX IF EXISTS osm_ocean_simplified_geometry_index;
-
-REFRESH MATERIALIZED VIEW osm_ocean_simplified;
-
-CREATE
-    INDEX IF NOT EXISTS osm_ocean_simplified_geometry_index ON
-    osm_ocean_simplified
-        USING gist(geom);
diff --git a/basemap/layers/point/create.sql b/basemap/layers/point/create.sql
index 2463e956e..dcdc60967 100644
--- a/basemap/layers/point/create.sql
+++ b/basemap/layers/point/create.sql
@@ -108,7 +108,7 @@ CREATE
         )= 'waterfall'
         OR(
             tags ->> 'railway'
-        )= 'level_crossing' WITH NO DATA;
+        )= 'level_crossing';
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z12;
@@ -147,7 +147,7 @@ CREATE
         )= 'wilderness_hut'
         OR(
             tags ->> 'waterway'
-        )= 'waterfall' WITH NO DATA;
+        )= 'waterfall';
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z11;
@@ -182,7 +182,7 @@ CREATE
         )
         OR(
             tags ->> 'highway'
-        )= 'motorway_junction' WITH NO DATA;
+        )= 'motorway_junction';
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z10;
@@ -216,7 +216,7 @@ CREATE
         )
         OR(
             tags ->> 'highway'
-        )= 'motorway_junction' WITH NO DATA;
+        )= 'motorway_junction';
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z9;
@@ -241,7 +241,7 @@ CREATE
             'municipality',
             'city',
             'town' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z8;
@@ -266,7 +266,7 @@ CREATE
             'municipality',
             'city',
             'town' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z7;
@@ -287,7 +287,7 @@ CREATE
             'sea',
             'state',
             'county' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z6;
@@ -308,7 +308,7 @@ CREATE
             'sea',
             'state',
             'county' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z5;
@@ -329,7 +329,7 @@ CREATE
             'sea',
             'state',
             'county' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z4;
@@ -348,7 +348,7 @@ CREATE
             ARRAY [ 'country',
             'city',
             'sea' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z3;
@@ -367,7 +367,7 @@ CREATE
             ARRAY [ 'country',
             'city',
             'sea' ]
-        ) WITH NO DATA;
+        );
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z2;
@@ -382,7 +382,7 @@ CREATE
     WHERE
         (
             tags ->> 'place'
-        )= 'country' WITH NO DATA;
+        )= 'country';
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_point_z1;
@@ -397,4 +397,108 @@ CREATE
     WHERE
         (
             tags ->> 'place'
-        )= 'country' WITH NO DATA;
+        )= 'country';
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z13_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z12_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z11_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z10_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z9_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z8_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z7_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z6_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z5_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z4_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z3_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z2_index;
+
+DROP
+    INDEX IF EXISTS osm_point_geom_z1_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z13_index ON
+    osm_point_z13
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z12_index ON
+    osm_point_z12
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z11_index ON
+    osm_point_z11
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z10_index ON
+    osm_point_z10
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z9_index ON
+    osm_point_z9
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z8_index ON
+    osm_point_z8
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z7_index ON
+    osm_point_z7
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z6_index ON
+    osm_point_z6
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z5_index ON
+    osm_point_z5
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z4_index ON
+    osm_point_z4
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z3_index ON
+    osm_point_z3
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z2_index ON
+    osm_point_z2
+        USING gist(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_point_geom_z1_index ON
+    osm_point_z1
+        USING gist(geom);
diff --git a/basemap/layers/point/refresh.sql b/basemap/layers/point/refresh.sql
deleted file mode 100644
index 6058abd73..000000000
--- a/basemap/layers/point/refresh.sql
+++ /dev/null
@@ -1,143 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_point_geom_z13_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z12_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z11_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z10_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z9_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z8_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z7_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z6_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z5_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z4_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z3_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z2_index;
-
-DROP
-    INDEX IF EXISTS osm_point_geom_z1_index;
-
-REFRESH MATERIALIZED VIEW osm_point_z13;
-
-REFRESH MATERIALIZED VIEW osm_point_z12;
-
-REFRESH MATERIALIZED VIEW osm_point_z11;
-
-REFRESH MATERIALIZED VIEW osm_point_z10;
-
-REFRESH MATERIALIZED VIEW osm_point_z9;
-
-REFRESH MATERIALIZED VIEW osm_point_z8;
-
-REFRESH MATERIALIZED VIEW osm_point_z7;
-
-REFRESH MATERIALIZED VIEW osm_point_z6;
-
-REFRESH MATERIALIZED VIEW osm_point_z5;
-
-REFRESH MATERIALIZED VIEW osm_point_z4;
-
-REFRESH MATERIALIZED VIEW osm_point_z3;
-
-REFRESH MATERIALIZED VIEW osm_point_z2;
-
-REFRESH MATERIALIZED VIEW osm_point_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z13_index ON
-    osm_point_z13
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z12_index ON
-    osm_point_z12
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z11_index ON
-    osm_point_z11
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z10_index ON
-    osm_point_z10
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z9_index ON
-    osm_point_z9
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z8_index ON
-    osm_point_z8
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z7_index ON
-    osm_point_z7
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z6_index ON
-    osm_point_z6
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z5_index ON
-    osm_point_z5
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z4_index ON
-    osm_point_z4
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z3_index ON
-    osm_point_z3
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z2_index ON
-    osm_point_z2
-        USING gist(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_point_geom_z1_index ON
-    osm_point_z1
-        USING gist(geom);
\ No newline at end of file
diff --git a/basemap/layers/railway/create.sql b/basemap/layers/railway/create.sql
index ae6e65435..434e2ea01 100644
--- a/basemap/layers/railway/create.sql
+++ b/basemap/layers/railway/create.sql
@@ -103,7 +103,15 @@ CREATE
             'subway',
             'tram'
         )
-        AND NOT tags ? 'service' WITH NO DATA;
+        AND NOT tags ? 'service';
+
+DROP
+    INDEX IF EXISTS osm_railway_filtered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_filtered_geom ON
+    osm_railway_filtered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_clustered CASCADE;
@@ -120,7 +128,15 @@ CREATE
             PARTITION BY railway
         ) AS cluster
     FROM
-        osm_railway_filtered WITH NO DATA;
+        osm_railway_filtered;
+
+DROP
+    INDEX IF EXISTS osm_railway_clustered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_clustered_geom ON
+    osm_railway_clustered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_simplified CASCADE;
@@ -154,7 +170,15 @@ CREATE
         ) AS tags,
         geom AS geom
     FROM
-        exploded WITH NO DATA;
+        exploded;
+
+DROP
+    INDEX IF EXISTS osm_railway_simplified_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_simplified_geom ON
+    osm_railway_simplified
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z12 CASCADE;
@@ -175,7 +199,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 12 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z12_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z12_geom_idx ON
+    osm_railway_z12
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z11 CASCADE;
@@ -196,7 +228,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 11 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z11_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z11_geom_idx ON
+    osm_railway_z11
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z10 CASCADE;
@@ -217,7 +257,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 10 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z10_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z10_geom_idx ON
+    osm_railway_z10
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z9 CASCADE;
@@ -238,7 +286,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 9 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z9_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z9_geom_idx ON
+    osm_railway_z9
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z8 CASCADE;
@@ -259,7 +315,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 8 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z8_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z8_geom_idx ON
+    osm_railway_z8
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z7 CASCADE;
@@ -280,7 +344,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 7 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z7_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z7_geom_idx ON
+    osm_railway_z7
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z6 CASCADE;
@@ -301,7 +373,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 6 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z6_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z6_geom_idx ON
+    osm_railway_z6
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z5 CASCADE;
@@ -322,7 +402,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 5 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z5_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z5_geom_idx ON
+    osm_railway_z5
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z4 CASCADE;
@@ -343,7 +431,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 4 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z4_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z4_geom_idx ON
+    osm_railway_z4
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z3 CASCADE;
@@ -364,7 +460,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 3 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z3_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z3_geom_idx ON
+    osm_railway_z3
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z2 CASCADE;
@@ -385,7 +489,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 2 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z2_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z2_geom_idx ON
+    osm_railway_z2
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_railway_z1 CASCADE;
@@ -406,4 +518,12 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 1 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_railway_z1_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_railway_z1_geom_idx ON
+    osm_railway_z1
+        USING GIST(geom);
diff --git a/basemap/layers/railway/refresh.sql b/basemap/layers/railway/refresh.sql
deleted file mode 100644
index f485acae1..000000000
--- a/basemap/layers/railway/refresh.sql
+++ /dev/null
@@ -1,163 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_railway_filtered_geom;
-
-REFRESH MATERIALIZED VIEW osm_railway_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_filtered_geom ON
-    osm_railway_filtered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_clustered_geom;
-
-REFRESH MATERIALIZED VIEW osm_railway_clustered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_clustered_geom ON
-    osm_railway_clustered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_simplified_geom;
-
-REFRESH MATERIALIZED VIEW osm_railway_simplified;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_simplified_geom ON
-    osm_railway_simplified
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z12_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z12_geom_idx ON
-    osm_railway_z12
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z11_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z11_geom_idx ON
-    osm_railway_z11
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z10_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z10_geom_idx ON
-    osm_railway_z10
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z9_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z9_geom_idx ON
-    osm_railway_z9
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z8_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z8_geom_idx ON
-    osm_railway_z8
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z7_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z7_geom_idx ON
-    osm_railway_z7
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z6_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z6_geom_idx ON
-    osm_railway_z6
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z5_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z5_geom_idx ON
-    osm_railway_z5
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z4_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z4_geom_idx ON
-    osm_railway_z4
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z3_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z3_geom_idx ON
-    osm_railway_z3
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z2_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z2_geom_idx ON
-    osm_railway_z2
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_railway_z1_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_railway_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_railway_z1_geom_idx ON
-    osm_railway_z1
-        USING GIST(geom);
diff --git a/basemap/layers/relation/create.sql b/basemap/layers/relation/create.sql
index 23a8f3332..3c76d508b 100644
--- a/basemap/layers/relation/create.sql
+++ b/basemap/layers/relation/create.sql
@@ -29,4 +29,20 @@ CREATE
             member_types INT [],
             member_roles text [],
             geom geometry
-        );
\ No newline at end of file
+        );
+
+DROP
+    INDEX IF EXISTS osm_relation_geom_index;
+
+DROP
+    INDEX IF EXISTS osm_relation_tags_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_relation_geom_index ON
+    osm_relation
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_relation_tags_index ON
+    osm_relation
+        USING GIN(tags);
diff --git a/basemap/layers/relation/refresh.sql b/basemap/layers/relation/refresh.sql
deleted file mode 100644
index d49b7f1fe..000000000
--- a/basemap/layers/relation/refresh.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_relation_geom_index;
-
-DROP
-    INDEX IF EXISTS osm_relation_tags_index;
-
-CREATE
-    INDEX IF NOT EXISTS osm_relation_geom_index ON
-    osm_relation
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_relation_tags_index ON
-    osm_relation
-        USING GIN(tags);
diff --git a/basemap/layers/route/create.sql b/basemap/layers/route/create.sql
index 5e83bfbdb..20ff603d5 100644
--- a/basemap/layers/route/create.sql
+++ b/basemap/layers/route/create.sql
@@ -109,7 +109,15 @@ CREATE
             'railway',
             'tram',
             'funicular'
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_filtered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_filtered_geom ON
+    osm_route_filtered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_clustered CASCADE;
@@ -126,7 +134,15 @@ CREATE
             PARTITION BY route
         ) AS cluster
     FROM
-        osm_route_filtered WITH NO DATA;
+        osm_route_filtered;
+
+DROP
+    INDEX IF EXISTS osm_route_clustered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_clustered_geom ON
+    osm_route_clustered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_simplified CASCADE;
@@ -160,7 +176,15 @@ CREATE
         ) AS tags,
         geom AS geom
     FROM
-        exploded WITH NO DATA;
+        exploded;
+
+DROP
+    INDEX IF EXISTS osm_route_simplified_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_simplified_geom ON
+    osm_route_simplified
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z12 CASCADE;
@@ -181,7 +205,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 12 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z12_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z12_geom_idx ON
+    osm_route_z12
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z11 CASCADE;
@@ -202,7 +234,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 11 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z11_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z11_geom_idx ON
+    osm_route_z11
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z10 CASCADE;
@@ -223,7 +263,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 10 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z10_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z10_geom_idx ON
+    osm_route_z10
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z9 CASCADE;
@@ -244,7 +292,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 9 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z9_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z9_geom_idx ON
+    osm_route_z9
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z8 CASCADE;
@@ -265,7 +321,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 8 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z8_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z8_geom_idx ON
+    osm_route_z8
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z7 CASCADE;
@@ -286,7 +350,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 7 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z7_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z7_geom_idx ON
+    osm_route_z7
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z6 CASCADE;
@@ -307,7 +379,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 6 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z6_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z6_geom_idx ON
+    osm_route_z6
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z5 CASCADE;
@@ -328,7 +408,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 5 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z5_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z5_geom_idx ON
+    osm_route_z5
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z4 CASCADE;
@@ -349,7 +437,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 4 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z4_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z4_geom_idx ON
+    osm_route_z4
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z3 CASCADE;
@@ -370,7 +466,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 3 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z3_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z3_geom_idx ON
+    osm_route_z3
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z2 CASCADE;
@@ -391,7 +495,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 2 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z2_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z2_geom_idx ON
+    osm_route_z2
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_route_z1 CASCADE;
@@ -412,4 +524,12 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 1 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_route_z1_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_route_z1_geom_idx ON
+    osm_route_z1
+        USING GIST(geom);
\ No newline at end of file
diff --git a/basemap/layers/route/refresh.sql b/basemap/layers/route/refresh.sql
deleted file mode 100644
index 09459ad41..000000000
--- a/basemap/layers/route/refresh.sql
+++ /dev/null
@@ -1,163 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_route_filtered_geom;
-
-REFRESH MATERIALIZED VIEW osm_route_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_filtered_geom ON
-    osm_route_filtered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_clustered_geom;
-
-REFRESH MATERIALIZED VIEW osm_route_clustered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_clustered_geom ON
-    osm_route_clustered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_simplified_geom;
-
-REFRESH MATERIALIZED VIEW osm_route_simplified;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_simplified_geom ON
-    osm_route_simplified
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z12_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z12_geom_idx ON
-    osm_route_z12
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z11_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z11_geom_idx ON
-    osm_route_z11
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z10_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z10_geom_idx ON
-    osm_route_z10
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z9_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z9_geom_idx ON
-    osm_route_z9
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z8_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z8_geom_idx ON
-    osm_route_z8
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z7_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z7_geom_idx ON
-    osm_route_z7
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z6_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z6_geom_idx ON
-    osm_route_z6
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z5_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z5_geom_idx ON
-    osm_route_z5
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z4_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z4_geom_idx ON
-    osm_route_z4
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z3_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z3_geom_idx ON
-    osm_route_z3
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z2_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z2_geom_idx ON
-    osm_route_z2
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_route_z1_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_route_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_route_z1_geom_idx ON
-    osm_route_z1
-        USING GIST(geom);
diff --git a/basemap/layers/waterway/create.sql b/basemap/layers/waterway/create.sql
index c4db91cbf..b7cba4038 100644
--- a/basemap/layers/waterway/create.sql
+++ b/basemap/layers/waterway/create.sql
@@ -104,7 +104,15 @@ CREATE
             'drain',
             'ditch'
         )
-        AND NOT tags ? 'intermittent' WITH NO DATA;
+        AND NOT tags ? 'intermittent';
+
+DROP
+    INDEX IF EXISTS osm_waterway_filtered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_filtered_geom ON
+    osm_waterway_filtered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_clustered CASCADE;
@@ -121,7 +129,15 @@ CREATE
             PARTITION BY waterway
         ) AS cluster
     FROM
-        osm_waterway_filtered WITH NO DATA;
+        osm_waterway_filtered;
+
+DROP
+    INDEX IF EXISTS osm_waterway_clustered_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_clustered_geom ON
+    osm_waterway_clustered
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_simplified CASCADE;
@@ -155,7 +171,15 @@ CREATE
         ) AS tags,
         geom AS geom
     FROM
-        exploded WITH NO DATA;
+        exploded;
+
+DROP
+    INDEX IF EXISTS osm_waterway_simplified_geom;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_simplified_geom ON
+    osm_waterway_simplified
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z12 CASCADE;
@@ -176,7 +200,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 12 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z12_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z12_geom_idx ON
+    osm_waterway_z12
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z11 CASCADE;
@@ -197,7 +229,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 11 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z11_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z11_geom_idx ON
+    osm_waterway_z11
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z10 CASCADE;
@@ -218,7 +258,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 10 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z10_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z10_geom_idx ON
+    osm_waterway_z10
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z9 CASCADE;
@@ -239,7 +287,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 9 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z9_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z9_geom_idx ON
+    osm_waterway_z9
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z8 CASCADE;
@@ -260,7 +316,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 8 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z8_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z8_geom_idx ON
+    osm_waterway_z8
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z7 CASCADE;
@@ -281,7 +345,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 7 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z7_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z7_geom_idx ON
+    osm_waterway_z7
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z6 CASCADE;
@@ -302,7 +374,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 6 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z6_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z6_geom_idx ON
+    osm_waterway_z6
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z5 CASCADE;
@@ -323,7 +403,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 5 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z5_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z5_geom_idx ON
+    osm_waterway_z5
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z4 CASCADE;
@@ -344,7 +432,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 4 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z4_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z4_geom_idx ON
+    osm_waterway_z4
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z3 CASCADE;
@@ -365,7 +461,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 3 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z3_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z3_geom_idx ON
+    osm_waterway_z3
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z2 CASCADE;
@@ -386,7 +490,15 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 2 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z2_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z2_geom_idx ON
+    osm_waterway_z2
+        USING GIST(geom);
 
 DROP
     MATERIALIZED VIEW IF EXISTS osm_waterway_z1 CASCADE;
@@ -407,4 +519,12 @@ CREATE
             st_area(
                 st_envelope(geom)
             )> POWER(( 78270 / POWER( 2, 1 )), 2 )
-        ) WITH NO DATA;
+        );
+
+DROP
+    INDEX IF EXISTS osm_waterway_z1_geom_idx;
+
+CREATE
+    INDEX IF NOT EXISTS osm_waterway_z1_geom_idx ON
+    osm_waterway_z1
+        USING GIST(geom);
diff --git a/basemap/layers/waterway/refresh.sql b/basemap/layers/waterway/refresh.sql
deleted file mode 100644
index d88331e44..000000000
--- a/basemap/layers/waterway/refresh.sql
+++ /dev/null
@@ -1,163 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_waterway_filtered_geom;
-
-REFRESH MATERIALIZED VIEW osm_waterway_filtered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_filtered_geom ON
-    osm_waterway_filtered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_clustered_geom;
-
-REFRESH MATERIALIZED VIEW osm_waterway_clustered;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_clustered_geom ON
-    osm_waterway_clustered
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_simplified_geom;
-
-REFRESH MATERIALIZED VIEW osm_waterway_simplified;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_simplified_geom ON
-    osm_waterway_simplified
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z12_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z12;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z12_geom_idx ON
-    osm_waterway_z12
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z11_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z11;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z11_geom_idx ON
-    osm_waterway_z11
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z10_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z10;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z10_geom_idx ON
-    osm_waterway_z10
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z9_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z9;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z9_geom_idx ON
-    osm_waterway_z9
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z8_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z8;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z8_geom_idx ON
-    osm_waterway_z8
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z7_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z7;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z7_geom_idx ON
-    osm_waterway_z7
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z6_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z6;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z6_geom_idx ON
-    osm_waterway_z6
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z5_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z5;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z5_geom_idx ON
-    osm_waterway_z5
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z4_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z4;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z4_geom_idx ON
-    osm_waterway_z4
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z3_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z3;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z3_geom_idx ON
-    osm_waterway_z3
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z2_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z2;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z2_geom_idx ON
-    osm_waterway_z2
-        USING GIST(geom);
-
-DROP
-    INDEX IF EXISTS osm_waterway_z1_geom_idx;
-
-REFRESH MATERIALIZED VIEW osm_waterway_z1;
-
-CREATE
-    INDEX IF NOT EXISTS osm_waterway_z1_geom_idx ON
-    osm_waterway_z1
-        USING GIST(geom);
diff --git a/basemap/layers/way/create.sql b/basemap/layers/way/create.sql
index ab634e58e..3b86ab144 100644
--- a/basemap/layers/way/create.sql
+++ b/basemap/layers/way/create.sql
@@ -28,3 +28,19 @@ CREATE
             nodes int8 [],
             geom geometry
         );
+
+DROP
+    INDEX IF EXISTS osm_way_geom_index;
+
+DROP
+    INDEX IF EXISTS osm_way_tags_index;
+
+CREATE
+    INDEX IF NOT EXISTS osm_way_geom_index ON
+    osm_way
+        USING GIST(geom);
+
+CREATE
+    INDEX IF NOT EXISTS osm_way_tags_index ON
+    osm_way
+        USING GIN(tags);
diff --git a/basemap/layers/way/refresh.sql b/basemap/layers/way/refresh.sql
deleted file mode 100644
index 023c9f338..000000000
--- a/basemap/layers/way/refresh.sql
+++ /dev/null
@@ -1,29 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one or more
--- contributor license agreements.  See the NOTICE file distributed with
--- this work for additional information regarding copyright ownership.
--- The ASF licenses this file to you under the Apache License, Version 2.0
--- (the "License"); you may not use this file except in compliance with
--- the License.  You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
-DROP
-    INDEX IF EXISTS osm_way_geom_index;
-
-DROP
-    INDEX IF EXISTS osm_way_tags_index;
-
-CREATE
-    INDEX IF NOT EXISTS osm_way_geom_index ON
-    osm_way
-        USING GIST(geom);
-
-CREATE
-    INDEX IF NOT EXISTS osm_way_tags_index ON
-    osm_way
-        USING GIN(tags);
diff --git a/basemap/refresh.js b/basemap/refresh.js
index a24f2116c..da501b4bb 100644
--- a/basemap/refresh.js
+++ b/basemap/refresh.js
@@ -19,30 +19,14 @@ import config from "./config.js";
 export default {
     "steps": [
         {
-            "id": "refresh-node",
+            "id": "refresh-materialized-views",
             "needs": [],
             "tasks": [
-                "layers/node/refresh.sql",
-                "layers/way/refresh.sql",
-                "layers/relation/refresh.sql",
-                "layers/member/refresh.sql",
-                "layers/amenity/refresh.sql",
-                "layers/ocean/refresh.sql",
-                "layers/highway/refresh.sql",
-                "layers/landuse/refresh.sql",
-                "layers/leisure/refresh.sql",
-                "layers/natural/refresh.sql",
-                "layers/point/refresh.sql",
-                "layers/railway/refresh.sql",
-                "layers/route/refresh.sql",
-                "layers/waterway/refresh.sql"
-            ].map(file => {
-                return {
-                    "type": "ExecuteSql",
-                    "file": file,
+                {
+                    "type": "RefreshMaterializedViews",
                     "database": config.database,
                 }
-            })
-        },
+            ]
+        }
     ]
 }