-Fix issue with folder navigation issue #8