group conditionals
fix bad request, we need a join after the rest