Make query reparsing mandatory