Fix wrong keyword name archived => archive
Add support for context-aware vs. naive field distributions