fix query_all