Add matching for street_address-Primary

Before, the API would only match for addresses in the form street_address_x, with x being a number. Primary street address fields on event forms, called street_address-Primary, were not matched for.