fix elfinder inputs
Merge branch 'dev' into datasource