dao query refactor
javadoc fix