SWC-1852: when asking for upload destinations, use the entity id that we have