move to query builder package