diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
index 6201fef33428b321accd06b4c09e4a83d50dc714..228ebb01b1aff80f671c0d491a8dde326a2dff9a 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
@@ -80,6 +80,8 @@ dataControllerMod.controller('DataController',
             self.dataService.resources = result.resourceitems;
             self.dataService.resourceDict = toIdBasedDict(self.dataService.resources);
             mapResourcesToGroups();
+
+            getResourceGroupClaims();
         });
     };
 
@@ -95,6 +97,8 @@ dataControllerMod.controller('DataController',
             self.dataService.resourceGroups = result.resourcegroups;
             self.dataService.resourceGroupsDict = toIdBasedDict(self.dataService.resourceGroups);
             mapResourcesToGroups();
+
+            getResources();
         });
     };
 
@@ -102,6 +106,8 @@ dataControllerMod.controller('DataController',
         $http.get('/rest/resourcegroupclaims').success(function(result) {
             self.dataService.resourceGroupClaims = result.resourcegroupclaims;
             self.dataService.resourceGroupClaimDict = toIdBasedDict(self.dataService.resourceGroupClaims);
+
+            setTimeout(function() { getResourceClaims() }, 100);
         });
     };
 
@@ -117,12 +123,9 @@ dataControllerMod.controller('DataController',
         });
     };
 
-    getTasks();
     getTaskTypes();
     getTaskStatusTypes();
+    getTasks();
     getResourceGroups();
-    getResourceGroupClaims();
-    getResources();
-    getResourceClaims();
 }
 ]);