Fix general search, refs #18853