Add city part to every street and fix search