add city to users and subscribers
add from to subscribers