[pl] false alarm fixes via disambiguation and some new rules