Navigation folder issue fix (DT-994)