Cleanup SearchService a bit and small fixes