#19 needed to re-compose decomposed query passed to scripts
updated to version 2.3