update api implementations for queries 2,3,5,10