Fixed entity reference fields workflow