Fix topicmaps management oddities.

Close #520