small changes & keep country same when tab changes