added patched WidgetList
fixed empty schema case