issue #21229: get rest_query tests to pass