Cleanup code and properly observe collection to allow reactive changes inside the search (again)