Fixed output escaping issues