fixing override of urlquery when using normalized url which does not contain any query by definition
Merge remote-tracking branch '52n/master'