Thumbnail fallback fixes and fine-tuning