Use ACE for badge queries

Seems ok this area is up to @sam.

2 Likes