Fixed multiple taxonomy support