Reverting the logic for request validation. Fixing query to ignore index adjustment