fix escape and quote