deleted products should not be available?

Fixes #4362
Fixes #4437