fixed a couple of group-skipping bugs - escaping logic, groups that include only nested groupds