[pl] more rules and more disambiguation