Partial clean-up of search controller.
Clean-up search services.