Add multi-folder search capabilities to classic skin (#1485234)