[Enhancement] Better thumbnail strategy
[Fix] Merge attempt