Align with latest ecwid shop front code