Bugfixes related to Taxa not loading properly