Fixed HQL in DAO implementations