Changed facet version to 1.7
Added a 2D collection of buckets to clean up intra-bucket fine sorting
and help fix bugs