Performed major re-factor to simply range facet builder code.