added escaping for completions