[TASK] Regex improvement keep punct chars and spaces around term threw callback wrapper