GeneratorFilters: add corrections for ParentChild and ParentTwoChildren...
GeneratorFilters: add corrections for ParentChild and ParentTwoChildren filters to make them in agreement with recent developments from 21.6
GeneratorFilters: add corrections for ParentChild and ParentTwoChildren filters to make them in agreement with recent developments from 21.6