#10596 bugfixing and adding affiliate link