WIP support geometry queries