Fixes city and country validation