PW-13488 cart link fix