diff --git a/lib/classes/consts.dart b/lib/classes/consts.dart
index 6679cbb..56b0008 100644
--- a/lib/classes/consts.dart
+++ b/lib/classes/consts.dart
@@ -3,8 +3,8 @@ import 'package:mohem_flutter_app/ui/marathon/widgets/question_card.dart';
 class ApiConsts {
   //static String baseUrl = "http://10.200.204.20:2801/"; // Local server
   // static String baseUrl = "https://erptstapp.srca.org.sa"; // SRCA server
-  static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
-  //  static String baseUrl = "https://hmgwebservices.com"; // Live server
+  // static String baseUrl = "https://uat.hmgwebservices.com"; // UAT server
+   static String baseUrl = "https://hmgwebservices.com"; // Live server
   static String baseUrlServices = baseUrl + "/Services/"; // server
   // static String baseUrlServices = "https://api.cssynapses.com/tangheem/"; // Live server
   static String utilitiesRest = baseUrlServices + "Utilities.svc/REST/";
diff --git a/lib/ui/work_list/work_list_screen.dart b/lib/ui/work_list/work_list_screen.dart
index bd12531..485921d 100644
--- a/lib/ui/work_list/work_list_screen.dart
+++ b/lib/ui/work_list/work_list_screen.dart
@@ -115,7 +115,7 @@ class _WorkListScreenState extends State<WorkListScreen> {
         }
       }
     });
-    workListItemTypes.removeWhere((element) => element.value == 0);
+    workListItemTypes.removeWhere((element) => element.value < 1);
     if (workListItemTypes.isNotEmpty) {
       workListItemIndex = workListItemIndex ?? 0;
     } else {
@@ -147,17 +147,6 @@ class _WorkListScreenState extends State<WorkListScreen> {
             }
           }
         });
-
-        // var tempList = providerData.getOpenNotificationsList?.where((notificationElement) {
-        //   return (notificationElement.itemType == workListItemTypes[workListItemIndex].key) && notificationElement.itemType == workListElement.key;
-        // }).toList();
-        // if (tempList!.isNotEmpty) {
-        //   if ((AppState().workList?.length ?? 0) != (tempList.first.openNtfNumber ?? 0)) {
-        //     workListElement.value = AppState().workList?.length ?? 0;
-        //     providerData.workListCounter = providerData.workListCounter - ((tempList.first.openNtfNumber ?? 0) - (AppState().workList?.length ?? 0));
-        //     providerData.notify();
-        //   }
-        // }
       }
     });
   }
@@ -357,28 +346,15 @@ class _WorkListScreenState extends State<WorkListScreen> {
         if (shouldReloadData != null) {
           if (shouldReloadData.toString() == "delegate_reload") {
             providerData.itgFormsModel!.totalCount = providerData.itgFormsModel!.totalCount! - 1;
+            workListItemIndex = null;
             calculateCounter();
-            setState(() {});
             if (workListItemIndex != null) {
               getWorkList();
+            } else {
+              setState(() {});
             }
           }
-          // workList!.remove(data);
-          // AppState().setWorkList = workList;
-          // if (data.iTEMTYPE == "ITG") {
-          //
-          //
-          // } else {
-          //   providerData.getOpenNotificationsList?.forEach((element) {
-          //     if (element.itemType == data.iTEMTYPE) {
-          //       element.openNtfNumber = element.openNtfNumber! - 1;
-          //     }
-          //   });
-          //   providerData.workListCounter = providerData.workListCounter - 1;
-          //   providerData.notify();
-          // }
-          // calculateCounter();
-          // if (mounted) setState(() {});
+
         } else {
           verifyWorkListCounter();
           if (mounted) setState(() {});
@@ -477,7 +453,13 @@ class _WorkListScreenState extends State<WorkListScreen> {
         if (shouldReloadData != null) {
           if (shouldReloadData.toString() == "delegate_reload") {
             verifyWorkListCounter();
-            getWorkList();
+            workListItemIndex = null;
+            calculateCounter();
+            if (workListItemIndex != null) {
+              getWorkList();
+            } else {
+              setState(() {});
+            }
           } else {
             workList!.remove(data);
             AppState().setWorkList = workList;