Made location work with current links