--- a/plcopen/plcopen.py	Sun Jan 08 19:16:58 2012 +0100
+++ b/plcopen/plcopen.py	Sun Jan 08 19:19:42 2012 +0100
@@ -999,11 +999,11 @@
     def Search(self, criteria, parent_infos=[]):
         search_result = _Search([("name", self.getname()), 
                                  ("type", self.gettypeAsText()),
-                                 ("address", self.getaddress())],
+                                 ("location", self.getaddress())],
                                 criteria, parent_infos)
         initial = self.getinitialValue()
         if initial is not None:
-            search_result.extend(_Search([("initial", initial.getvalue())], criteria, parent_infos))
+            search_result.extend(_Search([("initial value", initial.getvalue())], criteria, parent_infos))
         doc = self.getdocumentation()
         if doc is not None:
             search_result.extend(doc.Search(criteria, parent_infos + ["documentation"]))