Fixed sorting, added citizenships