correctly split query string; cleanups

41 jobs for !1281 with 798-dlz-build_querystring-broken in 21 minutes and 14 seconds (queued for 4 seconds)
merge request