Updated queries with DISTINCT
Updated Hibernate DAO methods to match new interface