Refactor Tag and Wiki policies"