Getting the field set passed to hierarchy generator correct.