Add affiliate_id filter + formatting