Change url redirect to use query string
This fixes problems where query strings in actual links were being lost.

Change-Id: Ibb8c46b950f64a69c2a7e393d78ff7c8f88cb0d6