vastly improved index view fix #27