Fix API to be less broken
Merge branch 'fix-buggy-index_search-interface'