Indexing fixes