Fixing counting and sorting bugs in organizer.