fixes in expiration date processing, changed policy.json structure