FilterProvider fixes