added basic unquote support