refactor and fix amenity-points

next part of #710
- ensures that all objects from amenity-points that can display name "a" as node on z20 can also display name "ÉÉÉÉÉÉ".
- wrap-width is set for all labels in amenity-points

This is proposed as single pull request to prevent merge conflicts, other alternative was to make single PR after every merge cycle what would slow down fixing #710 what blocks changes like #1040 and #1041.

Resolves #870, resolves #959.