Replace the explicit iteration with dict.update
Merge branch 'keep-query-blank-values' into develop

* keep-query-blank-values:
  Replace the explicit iteration with dict.update