Gold star in org navigation should be selected based on the primary orga...

...nization