Issue #8209 by cableman: Moved search logic into own object
Issue #8209 by cableman: Fixed better logging and fixed random errors in the new search object
Issue #8209 by cableman: Fixed removal in the new search object
Merge branch 'feature-search-object' into development