Update query to a version that doesn't produce superfluous fields