Cleaning-up and merge plugin taxonomy functionality