fix: remove monkey patch of batch to fix search #10165