Another attempt at getting the TBD + Sort combinations right on group directories. See #67