977851: 977321: Centralize CertSorter, drive updates, refresh properly