Fixed a few places where < and > were getting escaped