[903] Dataset search cleanup