adapt new search query for SalesForce saving