Fix handling of tags containing '&' character