better handling of single relationship widgets and related data