Gravity: Fix starting groups to use AND connectors where appropriate