Merge pull request #2596 from reaperhulk/index-aia

support indexing in AIA