Fixing incorrect context in filters