Fixed where groups when using andWhereGroup and orWhereGroup