further changes related to visited/non_visited countries functionality added