Fix up URI parametrised queries