added direct join when group is empty