Fix bug where calls didn't include query values