Fixed bug in upgrade visibility check, additional comments

Forgot to match upgrade candidates against the requested product, causing ALL products that were "Not Visible Individually" to become visible as long as an upgradeable product had been purchased by the customer before.

This update corrects that issue.