Fixes WFE-1121, improved folder navigation.