Merge "update sync queries to use searh data service"