Added escaping for spaces