Make country and repository id/name non-multivalue to allow sorting