-[dataset] filtering improved.
-[dataset] finally working!