Issue #8436 by cableman: Ensured that search is only updated on changes
Merge branch 'development' into feature-Video