[DEV] Add state variable filter