More fixes for multi-folder search (#1485234)