Sort out contributor order

Also fixes a bug introduced by the version of Content API we updated to

CC @janua @gklopper @rich-nguyen As this is a PROD bug could one of you take a look at this so I can ship it please? Thanks!