Further image selection changes