CNN selector fixed (again). Some work on section filtering