Updated to use siteurl to ensure proper url is captured for returns