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