Added support for &amp; parsing and media entities