Merchant navy bonus to EIC inconsitent

[Magma_Dragoon]

The culture bonus from EIC is added to the city yield as "from social policies", whereas the production bonus is part of "from buildings", yet the EIC itself shows only the 4 gold upon rolling over it. It should be one or the other, either the hammer bonus is also "from social policies" or the EIC itself has its yield modified by the policy, or both should be part of the capital tile yield.

Oh, for example, the policy universal healthcare add 1 happy per national wonder. This happy is added to the yield of the wonders' rollover in the city menu. Any policy that modifies a building should be displayed on the building's rollover.