Fix so you cant select subs for ever
Merge branch 'master' into web
Fix thumbs on virtualfolder