Cleanup, improving faceting functionality.