BDL-810: Fix image mapped inputs.