Issue #8436 by cableman: Ensured that search is only updated on changes