Respect user query when updating