Updated cert definitions, fixed category sort lost when collection is changed