Add compatibility with different quoting style

metadata API will fix its quoting soon.