Improve Term regex (HKA-17).