fix for SWC-503 and markdown escaping issue