Commit f4f7c97 changed the name of metadata facet key and value columns

Restore to the previous one