additional frontmatter tweaks
force fr_index_doc when value is only in fr_index_subject
Merge branch 'master' into production