DAT-2364 Use the value of city_variable instead of object

Backport of https://github.com/Wikia/app/pull/5731