changed queries to hql. #92