2350023 updated the way the widgetSelector works