new query system for data service