Improve handling of multiple policy in APEX PDP