More HideEmptyFolder performance fixes
3.0.154.0