work on index fixes