base

Fixed a crash with HUN's

The sorted order was never correctly updated, leading to
dead elements inside the map which might even be a memory
leak in the worst case.

Bug: 21725521
Change-Id: Ic2064a04d458445d11df94e0358d4d2044c8b995