- change join group logic
- add sort by in groups