Fix restoring route type and AVP list when droping branch.

Closes #365.