WIP - range queries fixed, first pass at geo