Improvement: separate images shop association from captions