Fix repository_type + team sorting