Case #3014 and #2001 - Sort criteria and automatic thumbnails