Fixed city language query, added tests.