diff --git a/config-data-executor/config-examples/block.xml b/config-data-executor/config-examples/block.xml
index aa243a4..7c0c5a0 100644
--- a/config-data-executor/config-examples/block.xml
+++ b/config-data-executor/config-examples/block.xml
@@ -28,7 +28,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>person_registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -67,7 +67,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>subpoena</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -93,7 +93,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>incidents</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -120,7 +120,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>geps_notifications</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -159,7 +159,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>journal_dev</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
diff --git a/config-data-executor/config-examples/removeFromCallList.xml b/config-data-executor/config-examples/removeFromCallList.xml
index 50ba061..f11f75b 100644
--- a/config-data-executor/config-examples/removeFromCallList.xml
+++ b/config-data-executor/config-examples/removeFromCallList.xml
@@ -20,7 +20,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>summon-list-registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -45,7 +45,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>person_registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
diff --git a/config-data-executor/config-examples/removeFromSystem.xml b/config-data-executor/config-examples/removeFromSystem.xml
index 4ff8b7f..242367f 100644
--- a/config-data-executor/config-examples/removeFromSystem.xml
+++ b/config-data-executor/config-examples/removeFromSystem.xml
@@ -36,7 +36,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>subpoena</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -65,7 +65,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>decision-document-service</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -105,7 +105,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>journal_dev</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -133,7 +133,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>geps_notifications</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -165,7 +165,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>incidents</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -208,7 +208,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>person_registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
@@ -237,7 +237,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>appeal-document-service</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
diff --git a/config-data-executor/config-examples/unblock.xml b/config-data-executor/config-examples/unblock.xml
index 48ef73e..24c307c 100644
--- a/config-data-executor/config-examples/unblock.xml
+++ b/config-data-executor/config-examples/unblock.xml
@@ -24,7 +24,7 @@
             <JdbcPassword>ervu</JdbcPassword>
             <JdbcDriverClassName>org.postgresql.Driver</JdbcDriverClassName>
             <JdbcXaDataSourceClassName>org.postgresql.xa.PGXADataSource</JdbcXaDataSourceClassName>
-            <JdbcXaDataSourcePoolSize>15</JdbcXaDataSourcePoolSize>
+            <JdbcXaDataSourcePoolSize>20</JdbcXaDataSourcePoolSize>
             <JdbcDatabase>person_registry</JdbcDatabase>
         </SqlConnectionParams>
     </SqlRequest>
diff --git a/config-data-executor/src/main/java/org/micord/service/RequestService.java b/config-data-executor/src/main/java/org/micord/service/RequestService.java
index efb9454..5ea5a8d 100644
--- a/config-data-executor/src/main/java/org/micord/service/RequestService.java
+++ b/config-data-executor/src/main/java/org/micord/service/RequestService.java
@@ -147,56 +147,59 @@ public class RequestService {
     }
   }
 
-  private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) {
-    Map<String, Object> resultMap = new HashMap<>();
-    String endpointArguments = ids.stream()
-        .map(id -> "'" + id.trim() + "'")
-        .collect(Collectors.joining(", "));
+private Map<String, Object> buildSqlQuery(SqlRequest request, List<String> ids) {
+  Map<String, Object> resultMap = new HashMap<>();
+  String endpointArguments;
 
-    String requestURL = request.getRequestURL();
+  String requestURL = request.getRequestURL();
 
-    if (requestURL.contains(":=")) {
-      endpointArguments = "'{" + endpointArguments + "}'";
-    } else {
-      endpointArguments = "(" + endpointArguments + ")";
-    }
+  if (requestURL.contains(":=")) {
+    endpointArguments = "'{" + ids.stream()
+        .map(String::trim)
+        .collect(Collectors.joining(", ")) + "}'";
+  } else {
+    endpointArguments = "(" + ids.stream()
+        .map(s -> "'" + s.trim() + "'")
+        .collect(Collectors.joining(", ")) + ")";
+  }
 
-    if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) {
-      for (RequestArgument argument : request.getRequestArguments()) {
+  if (request.getRequestArguments() != null && !request.getRequestArguments().isEmpty()) {
+    for (RequestArgument argument : request.getRequestArguments()) {
 
-        if (argument.getRequestArgumentConnectionParams() != null) {
-          try (Connection connection = DatabaseConnection.getConnection(
-              argument.getRequestArgumentConnectionParams())) {
-            String query = argument.getRequestArgumentURL();
-            List<String> result = fetchFileListFromDatabaseSQL(connection, query);
+      if (argument.getRequestArgumentConnectionParams() != null) {
+        try (Connection connection = DatabaseConnection.getConnection(
+            argument.getRequestArgumentConnectionParams())) {
+          String query = argument.getRequestArgumentURL();
+          List<String> result = fetchFileListFromDatabaseSQL(connection, query);
 
-            resultMap.put("ids", result);
+          resultMap.put("ids", result);
 
 
-            if (result != null && !result.isEmpty()) {
-              String resultSet = "(" + result.stream()
-                  .map(s -> "'" + s.trim() + "'")
-                  .collect(Collectors.joining(", ")) + ")";
+          if (result != null && !result.isEmpty()) {
+            String resultSet = "(" + result.stream()
+                .map(s -> "'" + s.trim() + "'")
+                .collect(Collectors.joining(", ")) + ")";
 
-              requestURL = requestURL.replace("${" + argument.getRequestArgumentName() + "}", resultSet);
-
-            }
+            requestURL = requestURL.replace("${" + argument.getRequestArgumentName() + "}", resultSet);
 
           }
-          catch (SQLException e) {
-            logger.error("Failed to execute query for RequestArgument", e);
-          }
+
+        }
+        catch (SQLException e) {
+          logger.error("Failed to execute query for RequestArgument", e);
         }
       }
     }
-
-    resultMap.put("requestURL", requestURL
-        .replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase())
-        .replace("${endpointArguments}", endpointArguments));
-
-    return resultMap;
   }
 
+  resultMap.put("requestURL", requestURL
+      .replace("${DB}", request.getSqlConnectionParams().getJdbcDatabase())
+      .replace("${endpointArguments}", endpointArguments));
+
+  return resultMap;
+}
+
+
   private boolean executeSqlQuery(Connection connection, String query) throws SQLException {
     try (PreparedStatement stmt = connection.prepareStatement(query)) {
       return stmt.execute();
diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page
index 6fb97d2..c9e012f 100644
--- a/resources/src/main/resources/business-model/main.page
+++ b/resources/src/main/resources/business-model/main.page
@@ -48,7 +48,6 @@
         <componentRootId>15508c49-88e3-4143-a398-cbfaedc4a59f</componentRootId>
         <name>Tab container</name>
         <container>true</container>
-        <expanded>false</expanded>
         <childrenReordered>false</childrenReordered>
         <scripts id="1c20b23e-f269-42ff-aa6f-ec2e7ff152cf"/>
         <scripts id="aba9b3cf-fe50-4149-84cd-ff7b6ed4e99d">