diff --git a/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java b/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java
index 64de41b..307d0a5 100644
--- a/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java
+++ b/src/main/java/com/jpromi/operation_point/mapper/OperationResponseMapper.java
@@ -64,11 +64,10 @@ public OperationResponse fromOperation(Operation operation) {
                                                 .isVolunteer(fd.getFiredepartment().getIsVolunteer())
                                                 .build() : null
                                 )
-                                // TMP fix to hide times for LA_WASTL_PUB operations (Legal reasons)
-                                .alarmTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getAlarmTime())
-                                .dispoTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getDispoTime())
-                                .inTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getInTime())
-                                .outTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : fd.getOutTime())
+                                .alarmTime(fd.getAlarmTime())
+                                .dispoTime(fd.getDispoTime())
+                                .inTime(fd.getInTime())
+                                .outTime(fd.getOutTime())
                                 .build()
                 );
             });
@@ -88,11 +87,10 @@ public OperationResponse fromOperation(Operation operation) {
                                                 .name(unit.getUnit().getFriendlyName())
                                                 .build() : null
                                 )
-                                // TMP fix to hide times for LA_WASTL_PUB operations (Legal reasons)
-                                .alarmTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getAlarmTime())
-                                .dispoTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getDispoTime())
-                                .outTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getOutTime())
-                                .inTime(operation.getServiceOrigin().equals(ServiceOriginEnum.LA_WASTL_PUB) ? null : unit.getInTime())
+                                .alarmTime(unit.getAlarmTime())
+                                .dispoTime(unit.getDispoTime())
+                                .outTime(unit.getOutTime())
+                                .inTime(unit.getInTime())
                                 .build()
                 );
             });
diff --git a/src/main/java/com/jpromi/operation_point/model/OperationResponse.java b/src/main/java/com/jpromi/operation_point/model/OperationResponse.java
index 8371341..f1e0abb 100644
--- a/src/main/java/com/jpromi/operation_point/model/OperationResponse.java
+++ b/src/main/java/com/jpromi/operation_point/model/OperationResponse.java
@@ -1,6 +1,8 @@
 package com.jpromi.operation_point.model;
 
 import com.jpromi.operation_point.enums.ServiceOriginEnum;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import lombok.*;
 
@@ -16,6 +18,9 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @XmlRootElement
+@Schema(
+        description = "Für Niederösterreich werden die Zeiten der Einheiten und Feuerwehren auf die erste stelle der Minute gerundet von der Schnittstelle mitgegeben, diese Daten IMMER wieflogt anziegen: HH:Mx:xx (z.B. 14:23:00 -> 14:2x:xx) (Oder ein ähnliches Format). Für alle anderen Bundesländer werden die Zeiten exakt übergeben."
+)
 public class OperationResponse {
     private UUID uuid;
     @Builder.Default
diff --git a/src/main/resources/templates/admin/unit-list.html b/src/main/resources/templates/admin/unit-list.html
index 01253a2..baffe67 100644
--- a/src/main/resources/templates/admin/unit-list.html
+++ b/src/main/resources/templates/admin/unit-list.html
@@ -45,11 +45,11 @@ <h1>Einheiten</h1>
                 <p th:if="${!page.hasPrevious()}">
                     <span class="arrow left"></span>
                 </p>
-                <a th:if="${page.hasPrevious()}" th:href="@{/admin/dashboard/firedepartment(q=${q}, page=${page.number - 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
+                <a th:if="${page.hasPrevious()}" th:href="@{/admin/dashboard/unit(q=${q}, page=${page.number - 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
                     <span class="arrow left"></span>
                 </a>
 
-                <a th:if="${page.hasNext()}" th:href="@{/admin/dashboard/firedepartment(q=${q}, page=${page.number + 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
+                <a th:if="${page.hasNext()}" th:href="@{/admin/dashboard/unit(q=${q}, page=${page.number + 1}, size=${page.size}, sort=${sort}, dir=${dir})}">
                     <span class="arrow right"></span>
                 </a>
                 <p th:if="${!page.hasNext()}">