add nav filter v3
Merge branches 'version3' and 'asd11' into version3