CR on pieroit-widget-refine