getting the correct url from atomLink + other minimal changes