cleanup `merge-query`; vector fields of query now stay vectors throughout query updates