QueryDSL implemented and refactoring