Fix #3815 "File filter and search view are broken"

TBR: @gaurave 

Fixes #3815. A follow-up to #3765. Purely mechanical fixes.