Add filter to add entitlements. closes #492