Fix problems with the Filter support