fileselect fix on ff
Merge branch 'develop' into feature/perspectivefilter