Fix to HqlQueryBuilder to ensure alias is set to the property name if no alias is explicitly referenced