update image handling and selection