Annexing a former puppet - Information improvements

[FeiLing]

You get to see this when you click on a puppet. It tells you your unhappiness will rise if you annex that puppet, but it doesn't tell you by how much. THIS has always causes many problems for me and I just assumed that maybe it's like 5 extra unhappiness or maybe around pop/2, but I don't really know. IT should clearly say: annexing this city will increase unhappiness by X (similar how it does when you capture a city (on mouseover)).

edit: even when you do annex it it will only show this:

It nowhere says how much additional unhappiness is caused. In this case my happiness decreased by -4. But I won't have remembered that ~10 turns later when I maybe have to decide which city to rush-buy a courthouse in or when I want to sell a city and don't know which as I don't know which causes most unhappiness -.-

Also: It says it an annexed/non-puppet city decreases the acquisition rate of new policies (yes, I know about that) and great people. How even I look at the GP progress in one of my city before I annexed a puppet and nothing changed. All numbers still were the same (like 69/200 at a rate of +3 per turn). Is this maybe a leftover from a previous version where the great people rate actually decreased if you had more cities (I think at 1.0.0.0 it would instead have gone to 69/300 then)? Or in what way does annexing a puppet slow down my GP generation?

---------------------------------

TL;DR version:
Improve the information given about unhappiness at the points in the game where the screenshots show (and fix what it says about Great Persons, if that actually happens to be obsolete).

 

[muhtesem insan]

It shows how much unhappines created by occupied cities and and citizens in those cities, in the happiness tooltip on upper bar.

 

[dexters]

seconded. What OP is asking is a tooltip to show extra unhappiness from occupying vs. puppeting.