Refactor custom Collector implementations: Spatial and Faceting