Added single selection support for faceting.

Also performed some re-factoring of names.