Fixed issues with single/double quotes