Updated the filtering module to use the global override datasource, if there is one