Fix bug in interpolating query parameters