minor changes

facets mappings and bugs