diff --git a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java
index 5cbb824ad0..95bf52b719 100644
--- a/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java
+++ b/kafka-ui-api/src/main/java/com/provectus/kafka/ui/cluster/service/ClusterService.java
@@ -150,7 +150,7 @@ public class ClusterService {
                 .flatMap(client -> ClusterUtil.toMono(client.getAdminClient().describeCluster().nodes())
                     .map(n -> n.stream().map(node -> {
                         Broker broker = new Broker();
-                        broker.setId(node.idString());
+                        broker.setId(node.id());
                         broker.setHost(node.host());
                         return broker;
                     }).collect(Collectors.toList())))
diff --git a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
index f07812ca8a..89acbb29ac 100644
--- a/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
+++ b/kafka-ui-contract/src/main/resources/swagger/kafka-ui-api.yaml
@@ -409,6 +409,8 @@ components:
           format: int64
         segmentCount:
           type: integer
+      required:
+        - brokerId
 
     BrokerMetrics:
       type: object
@@ -448,6 +450,8 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/Partition"
+      required:
+        - name
 
     Replica:
       type: object
@@ -488,6 +492,8 @@ components:
           type: integer
         underReplicatedPartitions:
           type: integer
+      required:
+        - name
 
     TopicConfig:
       type: object
@@ -498,6 +504,8 @@ components:
           type: string
         defaultValue:
           type: string
+      required:
+        - name
 
     TopicFormData:
       type: object
@@ -512,14 +520,18 @@ components:
           type: object
           additionalProperties:
             type: string
+      required:
+        - name
 
     Broker:
       type: object
       properties:
         id:
-          type: string
+          type: integer
         host:
           type: string
+      required:
+        - id
 
     ConsumerGroup:
       type: object
@@ -532,6 +544,9 @@ components:
             type: integer
         numTopics:
             type: integer
+      required:
+        - clusterId
+        - consumerGroupId
 
     TopicMessage:
       type: object
@@ -605,12 +620,17 @@ components:
         partition:
           type: integer
         currentOffset:
-          type: long
+          type: integer
+          format: int64
         endOffset:
-          type: long
+          type: integer
+          format: int64
         messagesBehind:
-          type: long
-
+          type: integer
+          format: int64
+      required:
+        - consumerId
+        
     ConsumerGroupDetails:
       type: object
       properties:
@@ -620,6 +640,8 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/ConsumerTopicPartitionDetail'
+      required:
+        - consumerGroupId
 
     Metric:
       type: object