#671 - Refactor friendly permission filtering