BVV-504 keep query params when redirecting