Improved file in folder search