fixing few issues with indexing and searches.