Fixing adress, moving city to filed