improve performance indexing