taxonomy support fixes