Improvements to indexing and searching
Fixed case of simple searches