reverted changes to edh and improved matching for NON itx text in source