(bug #3197) Fix errors in markup causing validation errors