Fix widget type selection