OZP-358  fixed duplicating widgets after mp add
OZP-682 fixing the introduced compile error, and lazy init exception