Fix image widget upload issue

Fixes RM-2659
Fix binary widget download issue

Fixes RM-2658