Fixed url query being decoded too early