Fixes and adjustments according https://track.ecwid.com/youtrack/issue/APPS-232#comment=84-84208