Updated logic so activity's imageId field is always populated