Merge pull request #1262 from dennishendriksen/master

fix #1177 popover text overflow
Fix #1273 Rest API does not resolve categorical references