SharePoint Metadata and muti-value document tagging

Hi,

My company uploaded documents to a document library. These documents were tagged using the Metadata defined on the Taxonomy Store. I created a content type and used it on the library as a document type. The terms are: State, Line of Biz among others. The issue is that a document can belong to two or more states, and used by several Lines of biz. So, I went to the library and edited the content type to allow multiple values for those fields. However, the views did not work anymore, since I cannot grouped by these multi-value fields (I had to remove the index from them…) How should I approach this?
Thanks so much for your advice!

Document Library

View1 for CT State
CT State
  Doc1Type
    Line1

View2 for NJ State
NY State
  Doc1Type (same as the one used on CT State)
    Line1 (same as the one used on CT State)
   
Metadata:
State
 NY
 NJ
 CT
 
 Document Type
  Doc1Type
  Doc2Type
 
Line
  Line1
  Line2