updateOption: invalidate last query because we might have updated the sortField
Merge commit '533c5c3136be5f09234ddf97fb7468751d17f273'

* commit '533c5c3136be5f09234ddf97fb7468751d17f273':
  updateOption: invalidate last query because we might have updated the sortField