Add isEmpty to selector
Move entity reference parameters build on demand