[pl] more disambiguation and some fixes to rules to avoid false negatives