Improve thumbnails management