diff --git a/lib/models/worklist/update_user_type_list.dart b/lib/models/worklist/update_user_type_list.dart
index 1637880..d5763ff 100644
--- a/lib/models/worklist/update_user_type_list.dart
+++ b/lib/models/worklist/update_user_type_list.dart
@@ -8,16 +8,16 @@ class UpdateUserTypesList {
 
   UpdateUserTypesList.fromJson(Map<String, dynamic> json) {
     itemID = json['ItemID'];
-    pFYAENABLEDFALG = json['P_FYAENABLED_FALG'];
-    pFYIENABLEDFALG = json['P_FYIENABLED_FALG'];
+    pFYAENABLEDFALG = json['P_FYA_ENABLED_FALG'];
+    pFYIENABLEDFALG = json['P_FYI_ENABLED_FLAG'];
     pITEMTYPE = json['P_ITEM_TYPE'];
   }
 
   Map<String, dynamic> toJson() {
     Map<String, dynamic> data = new Map<String, dynamic>();
     data['ItemID'] = this.itemID;
-    data['P_FYAENABLED_FALG'] = this.pFYAENABLEDFALG;
-    data['P_FYIENABLED_FALG'] = this.pFYIENABLEDFALG;
+    data['P_FYA_ENABLED_FALG'] = this.pFYAENABLEDFALG;
+    data['P_FYI_ENABLED_FLAG'] = this.pFYIENABLEDFALG;
     data['P_ITEM_TYPE'] = this.pITEMTYPE;
     return data;
   }
diff --git a/lib/ui/work_list/worklist_settings.dart b/lib/ui/work_list/worklist_settings.dart
index 77c1d81..7362028 100644
--- a/lib/ui/work_list/worklist_settings.dart
+++ b/lib/ui/work_list/worklist_settings.dart
@@ -47,13 +47,12 @@ class _WorklistSettingsState extends State<WorklistSettings> {
     try {
       Utils.showLoading(context);
       List<Map<String, dynamic>> itemList = [];
-      for (var element in getUserItemTypesList) {
-        itemList.add(UpdateUserTypesList(itemID: element.uSERITEMTYPEID, pITEMTYPE: element.iTEMTYPE, pFYAENABLEDFALG: element.fYAENABLEDFALG, pFYIENABLEDFALG: element.fYIENABLEDFLAG).toJson());
+      for (int index=0;index<getUserItemTypesList.length;index++) {
+        itemList.add(UpdateUserTypesList(itemID: index, pITEMTYPE: getUserItemTypesList[index].iTEMTYPE, pFYAENABLEDFALG: getUserItemTypesList[index].fYAENABLEDFALG, pFYIENABLEDFALG: getUserItemTypesList[index].fYIENABLEDFLAG).toJson());
       }
       updateUserItemTypesList = await WorkListApiClient().updateUserItemTypes(itemList);
       Utils.hideLoading(context);
-      Navigator.pushNamed(context, AppRoutes.workList);
-      setState(() {});
+      Navigator.pop(context);
     } catch (ex) {
       Utils.hideLoading(context);
       Utils.handleException(ex, context, null);