Fixes and enhancements to the thumbnail folder feature