diff --git a/setup.py b/setup.py
index 7896cf9b40756e9996aef24778b3567b9f4b35ae..d1231ed93bd0a9053b3db49353f6ad64f68dd3ab 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ from distutils.core import setup
 
 setup(
     name='MapServer Rest API',
-    version='1.0.1',
+    version='1.0.2',
     author='Neogeo Technologies',
     author_email='contact@neogeo-online.net',
     description='A RESTFul interface for MapServer',
diff --git a/src/mra.py b/src/mra.py
index 039af6cfd061089894c1c4dfb641055d4f524f92..8eb91ba443ab6dee4a9811d1e623844a2e076576 100644
--- a/src/mra.py
+++ b/src/mra.py
@@ -588,8 +588,8 @@ class FeatureTypeModel(LayerModel):
         for field in ft.iterfields():
             layer.set_metadatas({
                 "ows_name": layer_name,
-                "ows_title": layer_name,
-                "ows_abstract": layer_name,
+                "ows_title": layer.get_metadata("ows_title", None) or layer_name,
+                "ows_abstract": layer.get_metadata("ows_abstract", None) or layer_name,
                 "gml_%s_alias" % field.get_name(): field.get_name(),
                 "gml_%s_type" % field.get_name(): field.get_type_gml(),
                 # TODO: Add gml_<field name>_precision, gml_<field name>_width
@@ -684,11 +684,11 @@ class CoverageModel(LayerModel):
 
         layer.set_metadatas({
             "ows_name": layer_name,
-            "ows_title": layer_name,
-            "ows_abstract": layer_name,
-            "wcs_name": layer_name,
-            "wcs_label": layer_name,
-            "wcs_description": layer_name
+            "ows_title": layer.get_metadata("ows_title", None) or layer_name,
+            "ows_abstract": layer.get_metadata("ows_abstract", None) or layer_name,
+            "wcs_name": layer.get_metadata("wcs_name", None) or layer_name,
+            "wcs_label": layer.get_metadata("wcs_label", None) or layer_name,
+            "wcs_description": layer.get_metadata("wcs_description", None) or layer_name
             })
 
         layer.enable(enabled)