Country's names occluded by town's names on z3/z4

[matkoniecz]

See http://www.openstreetmap.org/?mlat=53.01&mlon=13.18#map=3/53.01/13.18 - label for Berlin is rendered. I would rather expect label for either Germany or Poland.

Madrid blocks country label on z3 and z4: http://www.openstreetmap.org/?mlat=41.51&mlon=-3.34#map=3/41.51/-3.34

Also other places are affected.