More improvements for E-matching