Minor cleanup on file search UI
Merge remote-tracking branch 'upstream/master' into abspath