Fix query url construction.
Merge remote-tracking branch 'template/master'