form values handled the same whether as comma-separated of multiple keys
Merge branch 'master' into es-document-index
No need to handle multiple terms fields.