Redo the filter by relationship
Redo the comparator by relationship