Add escaping for single args