[FIX] Various filtering fixes merged from 9.x: [bp/r46815], [bp/r46828], [bp/r47121], [bp/r47135]

git-svn-id: file:///var/local/code.tiki.org/tikisvn/branches/7.x@47183 b456876b-0849-0410-b77d-98878d47e9d5