diff --git a/src/main/java/ru/soune/nocopy/handler/ComplaintEntityHandler.java b/src/main/java/ru/soune/nocopy/handler/ComplaintEntityHandler.java
index d5a2842..5f3cf75 100644
--- a/src/main/java/ru/soune/nocopy/handler/ComplaintEntityHandler.java
+++ b/src/main/java/ru/soune/nocopy/handler/ComplaintEntityHandler.java
@@ -59,24 +59,16 @@ public class ComplaintEntityHandler implements RequestHandler {
                 userService.getUsersCompanyEmails(user.getCompany().getId());
 
         try {
-            switch (action) {
-                case "create":
-                    return handleCreate(msgId, complaintRequest);
-                case "get":
-                    return handleGet(msgId, complaintRequest);
-                case "get_all":
-                    return handleGetAll(msgId, complaintRequest, emails);
-                case "get_by_violation":
-                    return handleGetByViolation(msgId, complaintRequest);
-                case "update_status":
-                    return handleUpdateStatus(msgId, complaintRequest);
-                case "update":
-                    return handleUpdate(msgId, complaintRequest);
-                case "delete":
-                    return handleDelete(msgId, complaintRequest);
-                default:
-                    return errorResponse(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(), "Unknown action: " + action);
-            }
+            return switch (action) {
+                case "create" -> handleCreate(msgId, complaintRequest);
+                case "get" -> handleGet(msgId, complaintRequest);
+                case "get_all" -> handleGetAll(msgId, complaintRequest, emails);
+                case "get_by_violation" -> handleGetByViolation(msgId, complaintRequest);
+                case "update_status" -> handleUpdateStatus(msgId, complaintRequest);
+                case "update" -> handleUpdate(msgId, complaintRequest);
+                case "delete" -> handleDelete(msgId, complaintRequest);
+                default -> errorResponse(msgId, MessageCode.MSG_ID_NOT_FOUND.getCode(), "Unknown action: " + action);
+            };
         } catch (Exception e) {
             log.error("Error handling complaint request", e);
             return errorResponse(msgId, MessageCode.INVALID_JSON_BODY.getCode(), e.getMessage());
@@ -113,7 +105,7 @@ public class ComplaintEntityHandler implements RequestHandler {
 
         Map<String, Object> data = new HashMap<>();
         data.put("content", page.getContent());
-        data.put("page", page.getNumber());
+        data.put("page", page.getNumber() + 1);
         data.put("size", page.getSize());
         data.put("totalElements", page.getTotalElements());
         data.put("totalPages", page.getTotalPages());