sorting by units and district now work