Indexviewer bake fixes

confirm that it works please