indexing: Added back option for indexing