Convert all to the new FilterItem API