fixed value replacement
do not set images if NULL was passed