refactoring facet messaging
merge