use other parameters for subset filter
Merge branch 'newStructure' into newStructureWorkaround