made the widget repository mgmt more robust