Updated RegEx to allow elements to contain HTML