Support URL that already contains query string

PLAT-412 #time 20m