Added basic faceting.