Issue #20934:remove duplicate retrieval of quitem_id