Support for multi-field content db (i.e. created from multiple fields of a Solr index), more unit tests