Fix for or search in all cases refs #19213