Bugfixing with XML-view.