Giving more room for countries and taking it from dates