Moved affiliate_id filter to class-base