diff --git a/controllers/d.wiki.php b/controllers/d.wiki.php
index ee65816..7ec0ef3 100755
--- a/controllers/d.wiki.php
+++ b/controllers/d.wiki.php
@@ -64,7 +64,6 @@ else if(isset($controller->splitted_url[1]) && $wikiPage->checkUrl($controller->
 		if (isset($controller->splitted_url[2]) && is_numeric($controller->splitted_url[2]))
 			$wikiPage->checkUrl($controller->splitted_url[1],$user->role>=600, $controller->splitted_url[2]);
 
-		$wikiPage->populate();
 		$wikiPage->md2html();
 		$head['title'] = $wikiPage->title;
 		include ($config['views_folder']."d.wiki.view.html");
diff --git a/includes/routes.php b/includes/routes.php
index a299822..74c04e9 100755
--- a/includes/routes.php
+++ b/includes/routes.php
@@ -61,10 +61,9 @@ if($notfound) {
     require_once($config['models_folder']."d.wiki.php");
     $wikiPage = new WikiPage();
     $wikiPage->checkUrl('404');
-    $wikiPage->populate();
     $wikiPage->md2html();
     $head['css'] = "d.index.css;d.wiki.css";
-    $head['title'] = $wikiPage->title;
+    $head['title'] = $wikiPage->name;
     include ($config['views_folder']."d.wiki.view.html");
 }
 
diff --git a/models/d.wiki.php b/models/d.wiki.php
index f8046d6..f428edc 100755
--- a/models/d.wiki.php
+++ b/models/d.wiki.php
@@ -27,7 +27,7 @@ class WikiPage
 	public $content = NULL;
 
 	/*****
-	** Checks if a page at this URL exists and return the ID
+	** Checks if a page at this URL exists and return the populated element
 	*****/
 	public function checkUrl($url, $withArchive=0, $elementNb=0) {
 		global $config;
@@ -37,7 +37,7 @@ class WikiPage
 
 		$query = "SELECT * FROM contents WHERE permalink=$1";
 		if($withArchive==0) {
-			$query .= " AND is_archive=FALSE AND is_public=FALSE";
+			$query .= " AND is_archive=FALSE AND is_public=TRUE";
 		}
 		$query .= " ORDER BY update_date DESC LIMIT 1 OFFSET $2";
 
@@ -59,7 +59,7 @@ class WikiPage
 	}
 
 	/*****
-	** Populate the object using its ID
+	** Populate the object using raw data from SQL
 	*****/
 	private function populate($row) {
 		$this->permalink = $row['permalink'];
@@ -76,6 +76,20 @@ class WikiPage
 		$this->content = $row['content'];
 	}
 
+	/*****
+	** Return archive status
+	*****/
+	public function is_archive() {
+		return $this->is_archive;
+	}
+
+	/*****
+	** Return archive status
+	*****/
+	public function update_date() {
+		return $this->update_date;
+	}
+
 	/*****
 	** Edit a page by archiving the current one and inserting a new one ID
 	*****/
diff --git a/views/d.wiki.view.html b/views/d.wiki.view.html
index 0bf21d0..d6f0992 100755
--- a/views/d.wiki.view.html
+++ b/views/d.wiki.view.html
@@ -7,15 +7,15 @@
 
 		<? include('blocks/d.nav.html'); ?>
 
-		<section id="wiki_page" <?=$wikiPage->archive=="t"?'class="archive"':''?>>
-			<h1><?=$wikiPage->title?>.</h1>
+		<section id="wiki_page" <?=!$wikiPage->is_archive()?'class="archive"':''?>>
+			<h1><?=$wikiPage->name?>.</h1>
 				<? if($user->role >= 600) { ?>
 					<span class="subtitle">
 					<? if(isset($wikiHistory_list)) { ?>
 						<select id="wikihistory">
 							<? $i = 0;
 							foreach ($wikiHistory_list as $row) { ?>
-								<option <?=$row->id==$wikiPage->id?'selected':''?> value="<?=$i?>"><?=$row->archive=="f"?'&bull; ':''?><? echo strftime('%d/%m/%Y %H:%M:%S',strtotime($row->lastedit)) ?></option>
+								<option <?=$row->id==$wikiPage->id?'selected':''?> value="<?=$i?>"><?=$row->is_archive=="f"?'&bull; ':''?><? echo strftime('%d/%m/%Y %H:%M:%S',strtotime($row->lastedit)) ?></option>
 							<? $i++;
 							} ?>
 						</select>
@@ -25,7 +25,7 @@
 					<? }
 					if ($user->role >= 800) { ?>
 						<a href="<?=$config['rel_root_folder']?>wiki/<?=$wikiPage->url?>/edit"><i class="fa fa-pencil"></i> Éditer la page</a>
-						<? if ($wikiPage->archive == 'f') { ?>
+						<? if (!$wikiPage->is_archive()) { ?>
 							 &mdash; 
 							<a href="<?=$config['rel_root_folder']?>wiki/<?=$wikiPage->url?>/delete"><i class="fa fa-trash"></i> Effacer la page</a>
 						<? } ?>
@@ -37,7 +37,7 @@
 				<?=$wikiPage->content_html?>
 			</div>
 
-			<p id="wikiTimestamp">Page mise à jour le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($wikiPage->lastedit)) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
+			<p id="wikiTimestamp">Page mise à jour le <? echo strftime('%e %B %G, %kh%Mm%Ss',strtotime($wikiPage->update_date())) ?> <small><abbr title="Temps Universel Coordonné">UTC</abbr></small></p>
 
 			<div style="clear: both;"> </div>
 		</section>