query 1.9 support and api enhancements