Organize HasThumbnail concern