Simplify joins

It reads a lot better this way
Merge branch 'feature-auth-groupfinder-1'