fixing ordering again, also sorts by name asc after company asc