Fixed bug where searching nested folders broke everything.
Merge branch 'develop' into feature/AnimationSystem