Fix minor index view issues