update for dao query refactor