refactored search indexing and search results service quite a bit