diff --git a/composer.lock b/composer.lock
index 7a89e0195..721b09fe9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -878,16 +878,16 @@
         },
         {
             "name": "doctrine/mongodb-odm",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/mongodb-odm.git",
-                "reference": "9eedb38286805f8f084c9a530ef89379ed9bf4b5"
+                "reference": "e839648ef7649757aae3b9818236a6fa47c016cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/mongodb-odm/zipball/9eedb38286805f8f084c9a530ef89379ed9bf4b5",
-                "reference": "9eedb38286805f8f084c9a530ef89379ed9bf4b5",
+                "url": "https://api.github.com/repos/doctrine/mongodb-odm/zipball/e839648ef7649757aae3b9818236a6fa47c016cd",
+                "reference": "e839648ef7649757aae3b9818236a6fa47c016cd",
                 "shasum": ""
             },
             "require": {
@@ -958,7 +958,7 @@
                 "odm",
                 "persistence"
             ],
-            "time": "2016-07-27 13:16:06"
+            "time": "2016-10-07 09:18:05"
         },
         {
             "name": "doctrine/mongodb-odm-bundle",
@@ -2341,16 +2341,16 @@
         },
         {
             "name": "mouf/nodejs-installer",
-            "version": "v1.0.10",
+            "version": "v1.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thecodingmachine/nodejs-installer.git",
-                "reference": "bc598de486bb450e684221a3abcbfd6017dfca35"
+                "reference": "27c68c195a20bf7d144eb865e5e4f3046995eec8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thecodingmachine/nodejs-installer/zipball/bc598de486bb450e684221a3abcbfd6017dfca35",
-                "reference": "bc598de486bb450e684221a3abcbfd6017dfca35",
+                "url": "https://api.github.com/repos/thecodingmachine/nodejs-installer/zipball/27c68c195a20bf7d144eb865e5e4f3046995eec8",
+                "reference": "27c68c195a20bf7d144eb865e5e4f3046995eec8",
                 "shasum": ""
             },
             "require": {
@@ -2393,7 +2393,7 @@
                 "nodejs",
                 "npm"
             ],
-            "time": "2016-01-05 14:00:57"
+            "time": "2016-10-07 11:56:33"
         },
         {
             "name": "neutron/temporary-filesystem",
@@ -2621,12 +2621,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-cms-bundle.git",
-                "reference": "11d789d79272b759cfde5ef28e4d314369456514"
+                "reference": "62cff456ee13ac6d37f9b7d2eb252bdea86bae73"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-cms-bundle/zipball/11d789d79272b759cfde5ef28e4d314369456514",
-                "reference": "11d789d79272b759cfde5ef28e4d314369456514",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-cms-bundle/zipball/62cff456ee13ac6d37f9b7d2eb252bdea86bae73",
+                "reference": "62cff456ee13ac6d37f9b7d2eb252bdea86bae73",
                 "shasum": ""
             },
             "require": {
@@ -2718,7 +2718,7 @@
                 }
             ],
             "description": "This bundle provide the Back Office part of Open Orchestra",
-            "time": "2016-10-06 09:39:50"
+            "time": "2016-10-07 08:37:20"
         },
         {
             "name": "open-orchestra/open-orchestra-display-bundle",
@@ -2726,12 +2726,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-display-bundle.git",
-                "reference": "7b55708a29feddc90734624e45007989eb504e4d"
+                "reference": "69236549845ecdc36462d7ce1fdce84d5c5bd4ee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-display-bundle/zipball/7b55708a29feddc90734624e45007989eb504e4d",
-                "reference": "7b55708a29feddc90734624e45007989eb504e4d",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-display-bundle/zipball/69236549845ecdc36462d7ce1fdce84d5c5bd4ee",
+                "reference": "69236549845ecdc36462d7ce1fdce84d5c5bd4ee",
                 "shasum": ""
             },
             "require": {
@@ -2768,7 +2768,7 @@
                 }
             ],
             "description": "The bundle to display all bricks",
-            "time": "2016-10-04 15:15:16"
+            "time": "2016-10-07 08:31:19"
         },
         {
             "name": "open-orchestra/open-orchestra-elastica-bundle",
@@ -2837,12 +2837,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-libs.git",
-                "reference": "84cd89a6e66ff8dd517bc572a2e691300c11114f"
+                "reference": "0b4706f2379c6fa1406873b8ac6f3ed55ade02b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-libs/zipball/84cd89a6e66ff8dd517bc572a2e691300c11114f",
-                "reference": "84cd89a6e66ff8dd517bc572a2e691300c11114f",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-libs/zipball/0b4706f2379c6fa1406873b8ac6f3ed55ade02b3",
+                "reference": "0b4706f2379c6fa1406873b8ac6f3ed55ade02b3",
                 "shasum": ""
             },
             "require": {
@@ -2876,7 +2876,7 @@
                 }
             ],
             "description": "Some library for the Open Orchestra project",
-            "time": "2016-10-06 09:26:26"
+            "time": "2016-10-07 08:51:07"
         },
         {
             "name": "open-orchestra/open-orchestra-media-admin-bundle",
@@ -3072,12 +3072,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-model-bundle.git",
-                "reference": "44f68cacff1fb79f77d0af3bedec32b1322df4ea"
+                "reference": "8c379ef3501d91a8b477dc369cb2bb72dbd49f48"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-model-bundle/zipball/44f68cacff1fb79f77d0af3bedec32b1322df4ea",
-                "reference": "44f68cacff1fb79f77d0af3bedec32b1322df4ea",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-model-bundle/zipball/8c379ef3501d91a8b477dc369cb2bb72dbd49f48",
+                "reference": "8c379ef3501d91a8b477dc369cb2bb72dbd49f48",
                 "shasum": ""
             },
             "require": {
@@ -3112,7 +3112,7 @@
                 }
             ],
             "description": "A MongoDB implemantation of the Open Orchestra Model Interface",
-            "time": "2016-10-06 09:25:21"
+            "time": "2016-10-07 12:29:58"
         },
         {
             "name": "open-orchestra/open-orchestra-model-interface",
@@ -3120,12 +3120,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-model-interface.git",
-                "reference": "580a1b887e00fd9be6fb7c47232dfb075d30cd5c"
+                "reference": "78872de6da0fc3ca1aed35d26065f1c7ded09584"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-model-interface/zipball/580a1b887e00fd9be6fb7c47232dfb075d30cd5c",
-                "reference": "580a1b887e00fd9be6fb7c47232dfb075d30cd5c",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-model-interface/zipball/78872de6da0fc3ca1aed35d26065f1c7ded09584",
+                "reference": "78872de6da0fc3ca1aed35d26065f1c7ded09584",
                 "shasum": ""
             },
             "require": {
@@ -3157,7 +3157,7 @@
                 }
             ],
             "description": "Describe all entity and repository to implement for the whole OpenOrchestra project",
-            "time": "2016-10-06 09:24:39"
+            "time": "2016-10-07 08:33:19"
         },
         {
             "name": "open-orchestra/open-orchestra-mongo-libs",
@@ -3165,12 +3165,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/open-orchestra/open-orchestra-mongo-libs.git",
-                "reference": "71aea4c0f32c765dec36c47f486e0d4b012f2b3b"
+                "reference": "daee85104e59cc4f0ff24beaf86c2cac55276a2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-mongo-libs/zipball/71aea4c0f32c765dec36c47f486e0d4b012f2b3b",
-                "reference": "71aea4c0f32c765dec36c47f486e0d4b012f2b3b",
+                "url": "https://api.github.com/repos/open-orchestra/open-orchestra-mongo-libs/zipball/daee85104e59cc4f0ff24beaf86c2cac55276a2f",
+                "reference": "daee85104e59cc4f0ff24beaf86c2cac55276a2f",
                 "shasum": ""
             },
             "require": {
@@ -3208,7 +3208,7 @@
                 }
             ],
             "description": "Some libraries to use MongoDB in Open Orchestra",
-            "time": "2016-10-06 09:27:09"
+            "time": "2016-10-07 12:29:54"
         },
         {
             "name": "open-orchestra/open-orchestra-user-bundle",
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php
index 69b585a45..d2a6f185b 100644
--- a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php
+++ b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/AbstractDriverTest.php
@@ -56,11 +56,17 @@ protected function assertMetadata(ClassMetadata $metadata)
     {
         $this->assertInstanceOf('Metadata\ClassMetadata', $metadata);
         $propertiesMetadata = $metadata->propertyMetadata;
-
         $this->assertArrayHasKey('fakeProperty1', $propertiesMetadata);
-        $this->assertPropertyMetadata($propertiesMetadata['fakeProperty1'], 'fake_property1', 'fakeType', 'fakeProperty1');
         $this->assertArrayHasKey('fakeProperty2', $propertiesMetadata);
-        $this->assertPropertyMetadata($propertiesMetadata['fakeProperty2'], array("fake_property2", "fake_property_multi"), 'string', 'fakeProperty2');
+        $propertyMetadataFakeProperty1 = $propertiesMetadata['fakeProperty1']->propertySearchMetadata[0];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty1, 'fake_property1', 'fakeType', 'fakeProperty1');
+
+        $this->assertCount(2, $propertiesMetadata['fakeProperty2']->propertySearchMetadata);
+        $propertyMetadataFakeProperty2 = $propertiesMetadata['fakeProperty2']->propertySearchMetadata[0];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty2, array("fake_property2", "fake_property_multi"), 'string', 'fakeProperty2');
+        $propertyMetadataFakeProperty2Other = $propertiesMetadata['fakeProperty2']->propertySearchMetadata[1];
+        $this->assertPropertyMetadata($propertyMetadataFakeProperty2Other, "fake_property3", 'string', 'fakeProperty2');
+
     }
 
     /**
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php
index 1b0505177..894a444e1 100644
--- a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php
+++ b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/FakeClass/FakeClassMetadata.php
@@ -20,6 +20,7 @@ class FakeClassMetadata
 
     /**
      * @ORCHESTRA\Search(key={"fake_property2", "fake_property_multi"})
+     * @ORCHESTRA\Search(key="fake_property3")
      */
     protected $fakeProperty2;
 }
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml
index 358ea4108..9a1564070 100644
--- a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml
+++ b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/xml/FakeClassMetadata.xml
@@ -1,6 +1,9 @@
 <search-mapping>
     <class name="OpenOrchestra\FunctionalTests\Mapping\Metadata\Driver\FakeClass\FakeClassMetadata">
         <field field="fakeProperty1" key="fake_property1" type="fakeType" />
-        <field field="fakeProperty2" key="fake_property2, fake_property_multi"/>
+        <field field="fakeProperty2">
+            <search key="fake_property2, fake_property_multi"/>
+            <search key="fake_property3"/>
+        </field>
     </class>
 </search-mapping>
diff --git a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml
index c02e04505..6ff339df7 100644
--- a/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml
+++ b/src/OpenOrchestra/Tests/Functional/Mapping/Metadata/Driver/yml/FakeClassMetadata.yml
@@ -5,4 +5,7 @@ OpenOrchestra\FunctionalTests\Mapping\Metadata\Driver\FakeClass\FakeClassMetadat
             type: fakeType
             field: fakeProperty1
         fakeProperty2:
-            key: [fake_property2, fake_property_multi]
+            -
+              key: [fake_property2, fake_property_multi]
+            -
+              key: fake_property3