Fix for broken filters where this context was lost.

fixes #2157
- Properly bind filters where necessary