Fix facet editor and annotators