#4137 simplify facets and remove updatenotifier