matrix fixes for index view