Fixed #21612 -- Respect to_field in qs update