modified salesforce query