the refilter logic until we have a full solution in 1.4.3.