Skip logic grouping bug fixes