dataset click / minor fixes