better handling of affiliate links