Adding quote replacement as well as <> tags