ProductContainerListener logic refactor