Removed code duplication

2 jobs for bugfix/default-taxonomy-map in 3 minutes and 37 seconds (queued for 8 seconds)