quote escape fixes