Code cleanup: remove duplicated code, don't trigger multi-folder search on simple filter requests