Fixed sorting bug
Improved parent link