Fixed issue with double quotes and Markup