Move the patches around as it's not quite working.
Move taxonomies from site_feature to own feature