[Luis, Evgeny] data facet fixes