fixed @entity param omission handling