Improved numeral matching to cover more categories