Instance mapper for facet filter. Some fixes