Fix issue when restarting a search while a search is active
Merge branch 'feature/search-other-videos' into develop