[pl] new simple rule and some more disambiguation to have less false alarms