Added contextual filtering to operator list