[en] fix false alarms, add more disambiguation and one rule