diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js
index 44f7abd..9a8115e 100644
--- a/accounts/doctype/account/account.js
+++ b/accounts/doctype/account/account.js
@@ -124,6 +124,7 @@
 cur_frm.fields_dict['master_name'].get_query = function(doc) {
 	if (doc.master_type) {
 		return {
+			doctype: doc.master_type,
 			query: "accounts.doctype.account.account.get_master_name",
 			filters: {	"master_type": doc.master_type }
 		}
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
index ad0c1d0..3230ecf 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
+++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.js
@@ -36,11 +36,14 @@
 	// TO-do: check for pos, it should not come
 	if (!doc.account) msgprint("Please select Account first");
 	else {
-		query: "accounts.doctype.payment_to_invoice_matching_tool.payment_to_invoice_matching_tool.gl_entry_details",
-		filters: {
-			"dt": doc.voucher_type,
-			"acc": doc.account,
-			"account_type": doc.account_type 
+		return {
+			doctype: doc.voucher_type,
+			query: "accounts.doctype.payment_to_invoice_matching_tool.payment_to_invoice_matching_tool.gl_entry_details",
+			filters: {
+				"dt": doc.voucher_type,
+				"acc": doc.account,
+				"account_type": doc.account_type 
+			}
 		}		
 	}
 }
diff --git a/setup/doctype/authorization_rule/authorization_rule.js b/setup/doctype/authorization_rule/authorization_rule.js
index 1866cbc..fce0497 100644
--- a/setup/doctype/authorization_rule/authorization_rule.js
+++ b/setup/doctype/authorization_rule/authorization_rule.js
@@ -99,24 +99,20 @@
   }
 }
 
-// Approving Role Trigger
-// -----------------------
-// cur_frm.fields_dict['approving_role'].get_query = function(doc) {
-//   return 'SELECT tabRole.name FROM tabRole WHERE tabRole.name not in ("Administrator","Guest","All") AND tabRole.%(key)s LIKE "%s" LIMIT 50'
-// }
-
 
 // Master Name Trigger
 // --------------------
 cur_frm.fields_dict['master_name'].get_query = function(doc){
   if(doc.based_on == 'Customerwise Discount')
     return {
+	  doctype: "Customer",
       filters:[
         ['Customer', 'docstatus', '!=', 2]
       ]
     }
   else if(doc.based_on == 'Itemwise Discount')
     return {
+	  doctype: "Item",
       query: "controllers.queries.item_query"
     }
   else