Maintaining navigation aids

Taxonomy upgrade extras: