Hierarchy no longer causes infinite loops on certain pages

Cheap way to fix the bugs but its fixed