Change TODO BUG to NOTE since change to similar policy keys handling