Issue #418 Fix double encoded current_url