Fix mapping of policy teams to policies