Restructured filter var statement