WIP: new query/index implementation
integration with the map implementation