We need to remember that type shouldn't be hardcoded in the new version.  This will require the type being passed as a url parameter in the page.