Fixing 2 more specs. Now preparing the filtering object for specs.