Add treated filter + add odd/even depending on table_pk affinitic refs #5833