Improve the go back URL, avoid a redundant ?