WERE-687 Improves performance of image selection