SWC-735 Adjustments to ref widget improvements