[pl] add more disambiguation and some new rules