Better thumbnail support and search