Solve #2 ?

This should basically solve the problem where the country colors changed when different countries where selected.

This (supposedly) solves #2