Thumbnail handling improved