Added self-closing syntax to two tags for xhtml parsing