some minor fixes to make sure the functionality works in fileedit
Merge branch 'file-browse-improvements'