diff --git a/fbla-api/lib/fbla_api.dart b/fbla-api/lib/fbla_api.dart
index bd0b392..ddb88fb 100644
--- a/fbla-api/lib/fbla_api.dart
+++ b/fbla-api/lib/fbla_api.dart
@@ -158,7 +158,7 @@ void main() async {
         JobType.values.asNameMap().keys;
 
     // List<Map<String, List<Map<String, dynamic>>>> this is the real type lol
-    List<dynamic> output = [];
+    Map<String, dynamic> output = {};
 
     for (int i = 0; i < filters.length; i++) {
       var postgresResult = (await postgres.query('''
@@ -176,7 +176,7 @@ void main() async {
         '''))[0][0];
 
       if (postgresResult != null) {
-        output.add({filters.elementAt(i): postgresResult});
+        output.addAll({filters.elementAt(i): postgresResult});
       }
     }
 
diff --git a/fbla_ui/lib/api_logic.dart b/fbla_ui/lib/api_logic.dart
index f9c35c7..8025545 100644
--- a/fbla_ui/lib/api_logic.dart
+++ b/fbla_ui/lib/api_logic.dart
@@ -38,13 +38,20 @@ Future fetchBusinessDataOverview() async {
       var decodedResponse = json.decode(response.body);
       Map<JobType, List<Business>> groupedBusinesses = {};
 
-      for (int i = 0; i < decodedResponse.length; i++) {
+      for (String stringType in decodedResponse.keys) {
         groupedBusinesses.addAll({
-          JobType.values.byName(decodedResponse[i]):
+          JobType.values.byName(decodedResponse[stringType]):
               decodedResponse.map((json) => Business.fromJson(json)).toList()
         });
       }
 
+      // for (JobType type in decodedResponse.keys) {
+      //   groupedBusinesses.addAll({
+      //     JobType.values.byName(decodedResponse[i]):
+      //         decodedResponse.map((json) => Business.fromJson(json)).toList()
+      //   });
+      // }
+      print(groupedBusinesses);
       return groupedBusinesses;
     } else {
       return 'Error ${response.statusCode}! Please try again later!';