Add flexibility to numbered street type parsing