guarding against more than one preferred image in VRA work record

plus cleanup