Fixed NestedFilterDescriptor so that it exposes a filter descriptor rather than a query