Pricing Rule improvements #565