Better ux, we now handle images properly for both field types.