Robust indexing for automatic data collection.

Robust indexing for automatic data collection.