Refine facet behavior in the Topic demo MKWS-277