HQL strings fixed