Fix filemanager search input
Merge branch 'dev' into datasource