ImageViewer: image selection clean up