Add TODOs
Make sort order of policies in view deterministic