code refactoring for new facet markup
code refactoring for new facet markup