v6 simplify
work in progress
wip
Fully testing for v6 filters