Improving faceting options