re #874 - Added city to street