Bugfixing with XML-view.
Merge branch 'master' into test-FAN