This change adds distinct call to each recursive namespace query to
avoid buggy planning behavior. The change also ensures that resultset is
always in hierarchical order.