Add country and city options