Better quote handling