Update of HQL queries