Revert usage of get_taxonomy #586
Merge pull request #597 from x-team/hotfix-custom-categories

Revert usage of get_taxonomy #586
Merging master into develop