Fix bugs caused by removing empty sub_partition.

Fix empty sub_partition will cause mis-match on sub_node. This bugs
may cause more empty sub_partition.

Now the NCP = 16.39%