#105, better fix to prevent both single and double quotes from casuing issues. Escape method added to utils