Fixes for wp attributes layout with long values [fixup]

Extension of #1896. This deals with two issues that occurred to me
after merging.

https://www.openproject.org/work_packages/14596