add query13 api/steps impl that is consistent with latest spec