Merge pull request #284 from Verkalets/fix-code

Fix code
Merge pull request #285 from Verkalets/fix-code

fix: error on index, when city is empy
code up