diff --git a/.docs/examples/hazard.md b/.docs/examples/hazard.md
new file mode 100644
index 0000000000000000000000000000000000000000..9f434d8eae0f42b1703658980ac0e393036a0a2a
--- /dev/null
+++ b/.docs/examples/hazard.md
@@ -0,0 +1,23 @@
+---
+author: Martin Weise
+---
+
+## tl;dr
+
+[:fontawesome-solid-database:  Dataset](https://dbrepo1.ec.tuwien.ac.at/pid/51){ .md-button .md-button--primary target="_blank" }
+[:material-file-document:  Archive](https://doi.org/10.48436/yaecs-dgr27){ .md-button .md-button--secondary target="_blank" }
+
+## Description
+
+TBD
+
+## Solution
+
+TBD
+
+## DBRepo Features
+
+- [x] Complex database schema
+- [x] Complex views
+- [x] System versioning
+- [x] Subset exploration
\ No newline at end of file
diff --git a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
index 8820cd294aab3544d26a691486de083cef4cec21..b379c01cdff856ab09385a373dfb9173348ad8cb 100644
--- a/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
+++ b/dbrepo-data-service/services/src/main/java/at/tuwien/mapper/MariaDbMapper.java
@@ -287,7 +287,7 @@ public interface MariaDbMapper {
                                 .append(ck)
                                 .append(")"));
             }
-            if (!data.getDescription().isBlank()) {
+            if (data.getDescription() != null && !data.getDescription().isBlank()) {
                 /* create table comments */
                 stringBuilder.append(" COMMENT \"")
                         .append(data.getDescription())
diff --git a/dbrepo-ui/bun.lockb b/dbrepo-ui/bun.lockb
index d02f3f8c7351adf0b5c84fae2cc06eb90708a85c..2ae1649f86a2cfc2d75d6e45a0c9490ad434ae02 100755
Binary files a/dbrepo-ui/bun.lockb and b/dbrepo-ui/bun.lockb differ
diff --git a/dbrepo-ui/components/TimeDrift.vue b/dbrepo-ui/components/TimeDrift.vue
index 0617da8c4b6f18cf9412d9fd14ad613efd362415..362fa28aaf445bc93c2f2b91e6cf6ffcd4676645 100644
--- a/dbrepo-ui/components/TimeDrift.vue
+++ b/dbrepo-ui/components/TimeDrift.vue
@@ -43,6 +43,3 @@ export default {
   }
 }
 </script>
-
-<script setup lang="ts">
-</script>
diff --git a/dbrepo-ui/package.json b/dbrepo-ui/package.json
index 64feac40f11b24794b051c15f460dd19ea897ca9..2bbe6696bc2e59845e4d1d30194a860923f2760d 100644
--- a/dbrepo-ui/package.json
+++ b/dbrepo-ui/package.json
@@ -13,6 +13,8 @@
   "dependencies": {
     "@fontsource/open-sans": "^5.0.24",
     "@mdi/font": "^7.4.47",
+    "@nuxtjs/robots": "^3.0.0",
+    "@nuxtjs/sitemap": "^5.2.0",
     "@pinia/nuxt": "^0.5.1",
     "ace-builds": "^1.32.6",
     "axios": "^1.6.7",
diff --git a/dbrepo-ui/plugins/backend.ts b/dbrepo-ui/plugins/backend.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6d18d9e218a92efa8748e0179f6a51d46184f006
--- /dev/null
+++ b/dbrepo-ui/plugins/backend.ts
@@ -0,0 +1,10 @@
+export default defineNuxtPlugin((nuxtApp) => {
+  const config = useRuntimeConfig();
+  nuxtApp.provide('backendURL', () => {
+    if (process.server && !process.dev) {
+      return config.public.backendURLServer;
+    } else {
+      return config.public.backendURL;
+    }
+  });
+})
diff --git a/mkdocs.yml b/mkdocs.yml
index e4370152366f1e106cd95e23263bd62b481be5c0..b554e282e2d9a6aa694de49f4a346a9134975d47 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -44,6 +44,7 @@ nav:
       - Customization: api/ui.md
   - Examples:
     - COVID-19 Tweets: examples/covid19.md
+    - Hazardous Materials: examples/hazard.md
     - Influenza Monitoring: examples/influenza.md
     - Manufacturing Data: examples/manufacturing.md
     - Power Usage: examples/power.md