Re-add missing _P parameter.
Use legislation accessors (instead of _P) for isf functions.