K2/K3 Reporting

[jessebrk84]

I have a partnership and S Corp that both received foreign income from their investment account and have foreign taxes paid. Both of them received the income from an ETF which is made up of multiple stocks and thus has multiple countries. in years past RIC used to be an option for the country of origin but that seems to have gone away with the addition of the K2/K3. What is everyone else doing for these cases? 

I am inclined to select box 12 in Part I of the K2 form and attach a statement describing the income is from an RIC.