Replace with <> form instead of removing unfound vars.
Attempt to find matches in fields.