Fixed self-closing tags to match all occurrences