mark-level facets

[Fil]

Closes #1081

The internal changes are pretty substantial, but hopefully easy to read.

Note that one unit test changes because the order of the index returned by the "exclude" option is not guaranteed (it was arbitrary anyways).