#81: Fix street number and type bug