SP-155 updated nested folders tag to respect folder order