--- a/server/src/app/Http/Controllers/Api/DocumentController.php	Fri Feb 12 23:46:15 2016 +0100
+++ b/server/src/app/Http/Controllers/Api/DocumentController.php	Fri Feb 19 21:18:12 2016 +0100
@@ -26,9 +26,11 @@
     public function index()
     {
         $paginator = $this->documentRepository->paginateAll();
-        $res = [];
-        foreach ($paginator->toArray() as $key => $value) {
-            $res[($key === 'data')?'documents':$key] = $value;
+        $res = $paginator->toArray();
+        if(array_key_exists('data', $res)) {
+            $documents = $res['data'];
+            unset($res['data']);
+            $res['documents'] = $this->documentRepository->resolveLexvo($documents);
         }
         return response()->json($res);
     }
@@ -63,6 +65,7 @@
     public function show($id)
     {
         $doc = $this->documentRepository->get($id);
+        $this->documentRepository->resolveLexvo([$doc,]);
         if(is_null($doc)) {
             abort(404);
         }