Add janky support for spaces in file names
Merge brendan's search code