opts variable might not be available on error
Need to move initial folder list moving code to a post-pageload action, or else we lose the loading graphic
Merge branch 'master' into imp_6_2_flist