Improve status messages for return URLs
simplify return URL, use the same parameter