Fix HQL