Updates to search and fixes for indexing