Revert "fix bug - when the entity ID is not specified there should not be any"

This reverts commit e4fee7166e65108933732feb2733595ec23da764.