SWC-735 Reference widget improvements