Improve behaviour of widgetType