turned off search service - should be removed
removed unused import
added todo