handle cuts in queries - resolves #28