add quote handling