fixing recursion and oog links