changes for multiple collection indexing support