diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift
index 696329cb..29a116ad 100644
--- a/GMERemittance/AppDelegate.swift
+++ b/GMERemittance/AppDelegate.swift
@@ -19,7 +19,7 @@ import AlamofireNetworkActivityLogger
 import IQKeyboardManagerSwift
 import LGSideMenuController
    
-    let server: Server = .live
+    let server: Server = .stagging
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, MessagingDelegate {
diff --git a/GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift b/GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift
index bc7f6ddd..a018f1c2 100644
--- a/GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift
+++ b/GMERemittance/Library/ItemPickerView/ItemsPickerViewController.swift
@@ -148,12 +148,13 @@ extension ItemsPickerViewController: UITableViewDelegate {
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let cell = tableView.cellForRow(at: indexPath)
-        cell?.accessoryType = .checkmark
-        
-        if !self.allowMultipleSelection {
-            self.close(nil)
+        let selectedIndexPaths = self.tableVIew.indexPathsForSelectedRows ?? self.tableVIew.indexPathForSelectedRow.map({[$0]})
+        let selectedData = selectedIndexPaths?.compactMap { indexPath -> String? in
+            let value = filteredPlaces.elementAt(index: indexPath.row)
+            return value
         }
+        self.doneAction?(selectedData ?? [])
+        self.dismiss(animated: true, completion: nil)
     }
     
     func tableView(_ tableView: UITableView, didDeselectRowAt indexPath: IndexPath) {
diff --git a/GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift b/GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift
index 40dd1be1..cbe0dc65 100644
--- a/GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift	
+++ b/GMERemittance/Module/New Group/kycForm1/User Interface/View/kycForm1ViewController.swift	
@@ -47,9 +47,9 @@ class KycForm1ViewController: UIViewController {
         static let errorBorderWidth = AppConstants.errorBorderWidth
         static let errorLabelFont = Fonts.Error.font
         static let clearColor = UIColor.clear
-        static let male = "Male"
-        static let female = "Female"
-        static let other = "Other"
+        static let male = "M"
+        static let female = "F"
+        static let other = "O"
         static let cancelTitleString = "Cancel"
     }
     
@@ -441,7 +441,7 @@ extension KycForm1ViewController {
         })
         viewcontroller.data = data
         viewcontroller.doneAction = self.countrySelected
-        viewcontroller.defaultSelectedData = [self.selectedCountry]
+//        viewcontroller.defaultSelectedData = [self.selectedCountry]
         viewcontroller.type = PickerTitle.country
         self.present(viewcontroller, animated: true, completion: nil)
     }