Updated number / string detection heuristics matching user expectations