improve geohash_filter to use terms filter
and various other cleanups