Tweak to HQL