Success page + url fix