PSW-61 Added changes requested by shopware community store code review