Adapted search choices in #18621#10 and reset batch for new searches refs #18621