Refactor filter context

Refactor filter context