Fix up selection with images