Improve how required filters are handled