Fixed issue with returning to current url