update api implementations for queries 2,3,5,10
Merge branch '2.0-maint' into 2.1-maint