You updated the order of the original criteria (by contact, then account) already which is very helpful. Is it possible to also order the fields within the "account" section ? At the moment they are all over the place (screenshot attached) and it is difficult to find a particular field from the account.
christian.fritz