diff --git a/lib/api/worklist/worklist_api_client.dart b/lib/api/worklist/worklist_api_client.dart
index d55dc8d..f0d3d80 100644
--- a/lib/api/worklist/worklist_api_client.dart
+++ b/lib/api/worklist/worklist_api_client.dart
@@ -47,7 +47,7 @@ class WorkListApiClient {
     Map<String, dynamic> postParams = {
       "P_NOTIFICATION_TYPE": pNotificationType,
       "P_PAGE_NUM": pPageNum,
-      "P_PAGE_LIMIT": 25,
+      "P_PAGE_LIMIT": 50,
       "P_ITEM_TYPE": pItemType,
       "P_SEARCH_FROM_USER": pSearchUser,
       "P_SEARCH_ITEM_TYPE_DSP_NAME": pSearchItemType,
diff --git a/lib/widgets/location/Location.dart b/lib/widgets/location/Location.dart
index 9329cb4..62bd016 100644
--- a/lib/widgets/location/Location.dart
+++ b/lib/widgets/location/Location.dart
@@ -44,15 +44,18 @@ class Location {
 
     AppPermissions.location((granted) {
       if (granted) {
-        Geolocator.getLastKnownPosition(forceAndroidLocationManager: true).then((value) {
-          if (value == null) {
-            Geolocator.getCurrentPosition().then((value) {
-              done(value);
-            });
-          } else {
-            done(value);
-          }
+        Geolocator.getCurrentPosition(desiredAccuracy: LocationAccuracy.medium, timeLimit: const Duration(seconds: 5)).then((value) {
+          done(value);
         });
+        // Geolocator.getLastKnownPosition(forceAndroidLocationManager: true).then((value) {
+        //   if (value == null) {
+        //     Geolocator.getCurrentPosition().then((value) {
+        //       done(value);
+        //     });
+        //   } else {
+        //     done(value);
+        //   }
+        // });
       } else {
         // AppPermissions
       }