fix urgent quoting bugs