diff --git a/ios/Podfile b/ios/Podfile
index c0216e16..6cfb9447 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -40,6 +40,13 @@ post_install do |installer|
     target.build_configurations.each do |config|
         config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
     end
+    target.build_configurations.each do |config|
+          flutter_additional_ios_build_settings(target)
+          xcconfig_path = config.base_configuration_reference.real_path
+          xcconfig = File.read(xcconfig_path)
+          xcconfig_mod = xcconfig.gsub(/DT_TOOLCHAIN_DIR/, "TOOLCHAIN_DIR")
+          File.open(xcconfig_path, "w") { |file| file << xcconfig_mod }
+          end
   end
   installer.generated_projects.each do |project|
       project.targets.each do |target|
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 333ec9eb..7f78549d 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -161,7 +161,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -371,8 +371,9 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = DQ779YN74J;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Atoms;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -593,8 +594,9 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = DQ779YN74J;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Atoms;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -701,8 +703,9 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = DQ779YN74J;
+				DEVELOPMENT_TEAM = 3A359E86ZF;
 				ENABLE_BITCODE = NO;
+				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Atoms;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 56faec32..c87d15a3 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart
index 13c6611c..aaf495a8 100644
--- a/lib/controllers/providers/api/all_requests_provider.dart
+++ b/lib/controllers/providers/api/all_requests_provider.dart
@@ -140,7 +140,7 @@ class AllRequestsProvider extends ChangeNotifier {
 
   Future<int> getHighPriorityRequests() async {
     if (isHighPriorityLoading == true) return -2;
-    isHighPriorityLoading = true;
+    isHighPriorityLoading = true; notifyListeners();
     if (highPriorityRequests == null) notifyListeners();
     Response response;
     try {
diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
index 8d690c6a..baa5c2af 100644
--- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
+++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
@@ -163,6 +163,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
     final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
     if (search.startDate != null) search.endDate ??= DateTime.now();
     showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
+    requestsProvider.reset();
     await requestsProvider.getAllRequests(context, search: search);
     Navigator.pop(context);
     Navigator.of(context).pop(search);
diff --git a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
index 720ec78d..b6a4fa2a 100644
--- a/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
+++ b/lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
@@ -133,6 +133,7 @@ class _AllRequestsSearchPageState extends State<AllRequestsSearchPage> {
       _formKey.currentState.save();
       final requestsProvider = Provider.of<AllRequestsProvider>(context, listen: false);
       showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
+      requestsProvider.reset();
       await requestsProvider.getAllRequests(context, search: search);
       Navigator.pop(context);
       Navigator.of(context).pop(search);
diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
index b8f05348..5457782a 100644
--- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart
+++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart
@@ -37,6 +37,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
         context.translation.preventiveMaintenance,
       ];
       _provider = Provider.of<AllRequestsProvider>(context, listen: false);
+      _provider.reset();
       _provider.getAllRequests(context);
     }
 
diff --git a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
index 89d8bb3a..87b170de 100644
--- a/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
+++ b/lib/views/pages/sub_workorder/create_sub_workorder_page.dart
@@ -134,12 +134,15 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
   @override
   Widget build(BuildContext context) {
     final user = Provider.of<UserProvider>(context).user;
-    final isCurrentAssigned = (user.userID != widget.workOrder.assignedEmployee?.id);
-    if (isCurrentAssigned) {
+    final isCurrentUserIsAssistantEmp = (user.userID != widget.workOrder.assignedEmployee?.id);
+    if (isCurrentUserIsAssistantEmp) {
       // _subWorkOrders.assistantEmployees = [widget.workOrder.assistantEmployees?.first?.copyWith(id: 0)];
       _subWorkOrders.assistantEmployees = [AssistantEmployees(id: 0, user: AssignedEmployee(id: user.userID, name: user.username))];
     }
-    print("isCurrentAssigned:$isCurrentAssigned:${_subWorkOrders.assistantEmployees?.length}");
+    else {
+
+    }
+    print("isCurrentUserIsAssistantEmp:$isCurrentUserIsAssistantEmp:${widget.workOrder.assistantEmployees?.length}");
     if (_callRequestForWorkOrder == null) {
       _partsProvider = Provider.of<PartsProvider>(context);
       getAssetType();
@@ -321,7 +324,7 @@ class _CreateSubWorkOrderPageState extends State<CreateSubWorkOrderPage> {
                             //     : (_subWorkOrders.assistantEmployees?.isNotEmpty ?? false)
                             //         ? _subWorkOrders.assistantEmployees?.first
                             //         : null,
-                            enable: user.userID == _subWorkOrders.assignedEmployee.id,
+                            enable: !isCurrentUserIsAssistantEmp,
                             onSelect: (employee) {
                               if (employee == null) {
                                 _subWorkOrders.assistantEmployees = [];