Removed changes to QueryHelper