Fixes for role and single relation widgets