Improve geo-located query support
Add initial attribute metadata support