Make Country listing more responsive