Fixed GroupByUntil
added GroupJoin