Enhance the filter data API