Make sure our filter is handled better so we can override some options in our themes