Use query params explicitly. Fix #535