Please have a look at branch medranocalvo-correct-quoting [9485f6bb80].  Does it solve your problem?