Geohash rollup refactored