Thanks for reporting this issue.  Can you attach a patch which adds a unit test covering this behavior and fixing the quoting rules?  It would be very helpful in resolving this ticket.  If implementing the whole thing is too much work, if you could just provide a failing unit test that would still be greatly helpful.

Thanks again.