Index usability improvements2