apply code review changes for getFacet method