Only add a taxonomy, if the taxonomytype is actually set in the contenttype. Fixes #1443