Cleaned up many inconsistencies with facet params