More faceting updates.