Fix & improve return URL overriding