diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
index 2e154b86973601af8560c6055fe388fd614858a6..6db93855c3f05c25bf5abc8e2e3d97eb5c9c9e6a 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/Database.java
@@ -122,7 +122,8 @@ public class Database implements Serializable {
     private List<Table> tables;
 
     @ToString.Exclude
-    @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.MERGE, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
+    @OrderBy("id DESC")
+    @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "database", orphanRemoval = true)
     private List<View> views;
 
     @ToString.Exclude
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
index 3ed06bfd7c8ba6222bcbfbf45cfeb9a602e8fa91..63dc42b662fe2051292911dc89c294295f65040b 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java
@@ -24,6 +24,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.when;
@@ -91,6 +92,9 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
 
         /* test */
         viewService.delete(VIEW_1);
+        assertThrows(ViewNotFoundException.class, () -> {
+            viewService.findById(DATABASE_1, VIEW_1_ID);
+        });
     }
 
 }
diff --git a/helm/dbrepo/files/system.json b/helm/dbrepo/files/system.json
index c829e57d1a89633d70771c811843511dd9801358..52bf6d067122e2e803d2858256bfb274351d1f49 100644
--- a/helm/dbrepo/files/system.json
+++ b/helm/dbrepo/files/system.json
@@ -1292,7 +1292,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "auth-service:8080"
+              "options": "auth-service:9000"
             },
             "properties": [
               {
@@ -1442,10 +1442,6 @@
               {
                 "color": "green",
                 "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
               }
             ]
           },
@@ -1455,7 +1451,7 @@
           {
             "matcher": {
               "id": "byName",
-              "options": "auth-service:8080"
+              "options": "auth-service:9000"
             },
             "properties": [
               {
@@ -1803,7 +1799,7 @@
       "type": "timeseries"
     }
   ],
-  "refresh": "5s",
+  "refresh": "1m",
   "schemaVersion": 39,
   "tags": [
     "provisioned",