diff --git a/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java b/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
index f2baefc..9a0f77b 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/signal/PackageRecordsService.java
@@ -158,20 +158,17 @@ public class PackageRecordsService {
 
     public List<UserPackageLegalData> selectUserPackageLegalData(Set<Pair<Long, Long>> uniqueInnRegnumPairs) {
         try {
-            String json = entityToJsonMapper.writeValueAsString(uniqueInnRegnumPairs.stream()
-                    .filter(Objects::nonNull)
-                    .map(pair -> new HashMap<String, Object>() {{
-                        put("inn", pair.getKey());
-                        put("regnum", pair.getValue());
-                    }}).toList());
+            List<InnRegnumPair> pairs = uniqueInnRegnumPairs.stream()
+                    .map(pair -> new InnRegnumPair(pair.getKey(), pair.getValue()))
+                    .toList();
+
+            String json = entityToJsonMapper.writeValueAsString(pairs);
             return packagesRecordsMapper.selectUserPackageLegalData(json);
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
     }
 
-//    public List<PackagesRecordsMap> findByInnAndEgrn(Long phone) {
-//        return packagesRecordsMapper.findByPhone(phone);
-//    }
-
+    public record InnRegnumPair(Long inn, Long regNum) {
+    }
 }