diff --git a/src/MiniDocs/LePage.extension.st b/src/MiniDocs/LePage.extension.st
index 9853636..ba7b20c 100644
--- a/src/MiniDocs/LePage.extension.st
+++ b/src/MiniDocs/LePage.extension.st
@@ -129,10 +129,10 @@ LePage >> latestEditTime: aLeTime [
 { #category : #'*MiniDocs' }
 LePage >> localHostAddress [
 	| localUrl route |
-	MiniDocsServer teapot server isRunning ifFalse: [ MiniDocsServer start ].
+	MiniDocsServer teapot server isRunning ifFalse: [ MiniDocsServer restart ].
 	route := MiniDocsServer teapot staticRouter prefix joinUsing: '/'.
 	localUrl := MiniDocsServer teapot server localUrl asString. 
-	^  localUrl, route, '/', self markdeepFileName
+	^  {localUrl, route, '/', self markdeepFileName . MiniDocsServer}
 ]
 
 { #category : #'*MiniDocs' }
diff --git a/src/MiniDocs/PubPub.class.st b/src/MiniDocs/PubPub.class.st
index fb78386..4e763df 100644
--- a/src/MiniDocs/PubPub.class.st
+++ b/src/MiniDocs/PubPub.class.st
@@ -91,13 +91,6 @@ PubPub >> extractRawTableOfContents [
 	^ self extractAllContentsRaw first xpath: '//div[contains(concat(" ",normalize-space(@class)," "), " pub-preview-component ")]'
 ]
 
-{ #category : #accessing }
-PubPub >> extractTableOfContents [
-	^ self extractRawTableOfContents collect: [:each | 
-		PubPubContent fromXML: each
-	]
-]
-
 { #category : #accessing }
 PubPub >> folder [
 	^ folder ensureCreateDirectory
@@ -120,6 +113,16 @@ PubPub >> languageFolder [
  	^ self folder / self currentLanguage
 ]
 
+{ #category : #accessing }
+PubPub >> populateTableOfContents [
+	| contentsCollection |
+	contentsCollection := self extractRawTableOfContents collect: [:each | 
+		(PubPubContent fromXML: each)
+			language: self currentLanguage
+	].
+	self addTableOfContents: contentsCollection asOrderedCollection
+]
+
 { #category : #accessing }
 PubPub >> printOn: aStream [
 	super printOn: aStream.
@@ -133,6 +136,22 @@ PubPub >> tableOfContents [
 	^ tableOfContents at: self currentLanguage
 ]
 
+{ #category : #accessing }
+PubPub >> tableOfContents: anObject [
+	tableOfContents := anObject 
+]
+
+{ #category : #accessing }
+PubPub >> tableOfContentsDictionary [
+	| response |
+	response := OrderedDictionary new.
+	self tableOfContents do: [:content | 
+		response
+			at: content shortName put: content id
+	].
+	^ response
+]
+
 { #category : #accessing }
 PubPub >> titles [
 	^ titles ifNil: [titles := OrderedDictionary new]
diff --git a/src/MiniDocs/PubPubContent.class.st b/src/MiniDocs/PubPubContent.class.st
index 375aee2..d84e3fd 100644
--- a/src/MiniDocs/PubPubContent.class.st
+++ b/src/MiniDocs/PubPubContent.class.st
@@ -37,6 +37,11 @@ PubPubContent >> id [
 	^ (self url splitOn: $/) last
 ]
 
+{ #category : #'as yet unclassified' }
+PubPubContent >> language: aString [ 
+	language := aString
+]
+
 { #category : #accessing }
 PubPubContent >> printOn: aStream [
 	super printOn: aStream.