Updated indexing, mapping, and queries.