diff --git a/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java b/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java
index 5155c58..3265cc9 100644
--- a/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java
+++ b/src/main/java/com/eactive/testmaster/client/mapper/ApiRequestMapper.java
@@ -60,7 +60,7 @@ public abstract class ApiRequestMapper {
 
     @AfterMapping
     public void handleTypeSpecificMapping(ApiRequestInfo entity, @MappingTarget ApiRequestDTO dto) {
-        if ("TCP".equals(entity.getType())) {
+        if ("TCP".equals(entity.getType()) || "HTTPFlat".equals(entity.getType())) {
             ApiLayout layout = apiLayoutRepository.findFirstByApiRequestInfo(entity);
             if (layout != null) {
                 layout.getLayoutItems().sort(Comparator.comparingInt(ApiLayoutItem::getLoutItemSerno));
diff --git a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java
index 2bb9c14..232793a 100644
--- a/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java
+++ b/src/main/java/com/eactive/testmaster/client/service/ApiRequestMgmtService.java
@@ -27,6 +27,10 @@ public class ApiRequestMgmtService {
     @Autowired
     ApiRequestRepository apiRequestRepository;
 
+    //findAll
+    public List<ApiCollection> findAll() {
+        return apiCollectionRepository.findAll();
+    }
 
     public List<ApiCollection> getMyApis(StaffUser user) {
         return apiCollectionRepository.findAllByOwner(user);