Issue #3226669 by shabana.navas, vijaycs85: Entity ID is omitted when dispensing code and looking up code count