YH-480: hide visibility selector
YH-480: add state selector to datasets and services