Really fix that FROM group condition
5 files changed