Put a hack in to index country names if we have a code