refactor query methods to share code
refactor query methods to share code

SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,SalesforceFoundation/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,Zosoled/Cumulus,SalesforceFoundation/Cumulus