fixed index view
added less hardcoded map types