Adding in fix to handle policyId for diagram context. Fixes diagram
compare issues