Minor fixes: lift filter inputs to private variables