[OE-3361] siteandfirmwidget fix