Fixed issues for single and double quotes.