Fixes to filter provider