Issue #2656226 by ChristianAdamski, borisson_: Remove set|getOption from Facet Entity et al. and fix schema