Fix issue with differing behavior server and client side in filters fix
Add test that highlights issue server-side with previous filter fixes