Bug fix and updates for including in all hierarchical post types

Check out the 3 commits for details about each change.