Fixed single and double quote problems