Dont expose internal data in Facet interfaces
Merge PR #1344 by @msteiger - facet streamlining