added support of fields street_n1, street_n2