Allow short names for countries and indicators