query-sync wip