Issue 218 web api query support