diff --git a/application/language/en/sales_lang.php b/application/language/en/sales_lang.php
index 499f12ad8..6480c82ad 100644
--- a/application/language/en/sales_lang.php
+++ b/application/language/en/sales_lang.php
@@ -70,8 +70,8 @@ $lang["sales_sale_for_customer"] = "Customer:";
 $lang["sales_sale_time"] = "Time";
 $lang["sales_select_customer"] = "Select Customer (Optional)";
 $lang["sales_serial"] = "Serial";
-$lang["sales_start_typing_customer_name"] = "Start Typing customer\'s name...";
-$lang["sales_start_typing_item_name"] = "Start Typing item\'s name or scan barcode...";
+$lang["sales_start_typing_customer_name"] = "Start Typing customer's name...";
+$lang["sales_start_typing_item_name"] = "Start Typing item's name or scan barcode...";
 $lang["sales_stock_location"] = "Stock location";
 $lang["sales_sub_total"] = "Sub Total";
 $lang["sales_successfully_deleted"] = "You have successfully deleted";
diff --git a/application/views/people/form_basic_info.php b/application/views/people/form_basic_info.php
index 74b7dd026..1fdfc6b79 100644
--- a/application/views/people/form_basic_info.php
+++ b/application/views/people/form_basic_info.php
@@ -196,7 +196,7 @@ $(document).ready(function()
 		type: 'GET',
 		dataType:'json',
 		extraParams: request_params("postcode", "postalcode"),
-		parse: create_parser('postcode', ["postcode", "city_district|town|city", "state", "country"])
+		parse: create_parser('postcode', ["postcode", "village|city_district|town|hamlet|city|county", "state", "country"])
 	});
     $("#postcode").result(handle_city_completion);
 
@@ -208,7 +208,7 @@ $(document).ready(function()
 		type: 'GET',
 		dataType:'json',
 		extraParams: request_params("city"),
-		parse: create_parser('city', ["postcode", "city_district|town|city", "state", "country"])
+		parse: create_parser('city', ["postcode", "village|city_district|town|hamlet|city|county", "state", "country"])
 	});
    	$("#city").result(handle_city_completion);
 
diff --git a/translations/sales_lang.csv b/translations/sales_lang.csv
index 1443e37ea..e990b0efa 100644
--- a/translations/sales_lang.csv
+++ b/translations/sales_lang.csv
@@ -69,8 +69,8 @@
 "sales_sale_time","Datum","Hora","Time","Time","Time","Time","","Saat","Waktu"
 "sales_select_customer","Selecteer Klant (Optioneel)","Seleccionar Cliente (Opcional)","Select Customer (Optional)","Choisir Client (Facultatif)","選擇客戶 (Optional)","Выберите клиента (необязательно)","เลือกลูกค้า (Optional)","Müşteri Seç (İsteğe Bağlı)","Pilih Pelanggan (Opsional)"
 "sales_serial","Nummer","Serial","Serial","Serie","序號","серийный номер","Serial","Seri","Serial"
-"sales_start_typing_customer_name","Typ naam klant...","Empieza a escribir el cliente...","Start Typing customer\'s name...","Commencez à saisir le nom du client...","開始輸入客戶的名字","Начните печатать название клиента...","เริ่มต้นพิมพ์ชื่อลูกค้า...","Müşteri Adı...","Ketik Nama Pelanggan..."
-"sales_start_typing_item_name","Typ naam product of barcode...","Empieza a escribir o escanea el código de barras...","Start Typing item\'s name or scan barcode...","Commencez à saisir le nom de l\'item ou scannez le code-barre...","開始輸入產品名或掃描條碼...","Начните печатать название товара или сканировайте штрих-кода...","เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...","Ürün adı yazın yada barkod okutun...","Ketik Nama Barang atau Scan Barcode..."
+"sales_start_typing_customer_name","Typ naam klant...","Empieza a escribir el cliente...","Start Typing customer's name...","Commencez à saisir le nom du client...","開始輸入客戶的名字","Начните печатать название клиента...","เริ่มต้นพิมพ์ชื่อลูกค้า...","Müşteri Adı...","Ketik Nama Pelanggan..."
+"sales_start_typing_item_name","Typ naam product of barcode...","Empieza a escribir o escanea el código de barras...","Start Typing item's name or scan barcode...","Commencez à saisir le nom de l\'item ou scannez le code-barre...","開始輸入產品名或掃描條碼...","Начните печатать название товара или сканировайте штрих-кода...","เริ่มต้นพิมพ์ชื่อสินค้า หรือ สแกนบาร์โค๊ด...","Ürün adı yazın yada barkod okutun...","Ketik Nama Barang atau Scan Barcode..."
 "sales_stock_location","Stock locatie","","Stock location","","","","","Stok yeri",""
 "sales_sub_total","Subtotaal excl. VAT","Subtotal","Sub Total","Sous-Total","小計","промежуточный итог","ยอดรวมหักภาษี ","Ara Toplam","Sub Total"
 "sales_successfully_deleted","Uw aankoop werd verwijded","La Venta ha sido borrada satisfactoriamente","You have successfully deleted","Vente supprimée","銷售資料成功刪除","продажи успешно удален","ลบการขายสมยูรณ์","Satış silindi","Transaksi Penjualan berhasil dihapus"