Small simplification
list groups and organizations separately