Issue #20570 Add toOne non-isNested to query params and improve speed by 25%.