Bugfixes and changes to taxonomy output