Merge pull request #23514 from deepeshgarg007/batch_search_fix

fix: Condition in batch selector query