Fix the filter/queries in the provider