refactoring Filepicker usage, closes #308