Improve AST_spatial