Small changes for faceting