Update API doc and add custom query doc