replace image.ShortID()'s with image.ID for #2098