Fixed Taxonomies and Categories as well as added subcategories