fix belongs-to-one linkage with non-primary fields