CS fix
Added search service