- refactor DBQuery