Fixed queries being overwritten by join conditions
Merge branch 'master' of github.com:servicescout/Gamification