New option/tool for finding certain buildings

I have troubles with finding buildings on my map which is full with building spots. Yes, I know that buildings producing items can be found by economy overview, but for example population buildings isn't seen from there. Atm I try to find my Nord residences for upgrading, but they are hiding really good :)

So some kind of tool etc. would be nice to have.

In S4 there was a button in the Building menu that led to the next building of the same type. It was very helpful.