improved sorting by address, ethnic_quota added to units list