WL-3501 Fix itemsearch and file tree