Added search support, refactored indexing service.