Include Tartu street names in Address + cleanup