Fixed encoding issues with quotes