Resolve "Changing tag method in policy is not applied to spamfilter users" Closes #5902 and #5543 See merge request !1322