EZP-20502: made sure image id is always set