LUGG-138 : Fix for facets