Add escaping of group query variables