Add Filter functionality. Add functional test for it.