Facet removal and count alignment fix.