[en] more disambiguation and false alarm fixing