Changes: Fixed client-side query validation.