CLSN-1593 : queries to hql