fixed bug with country_ts token if no country set