Add option to disable query on butcher

Addresses issue #2375