Bugfix/4196 nbsp in various places