Trying to fix VAR filter and related components