Revise design of role based facet