Add/fix index selectors.

Closes #3758.