Fix business support facet duplication

This also cleans up a bunch of redundant bits of code.