Update to code for redirecting to data page, etc.