Changed the way the popup taxa content is generated in order to easily include both complete and active data sets