Fixed wrap query param bug