diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index 32bc18cd92b498635edd0fcff6b5dec332069e45..9997efa52934025c8d61e7cd6eb8414737af9fe8 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -63,6 +63,7 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
                         .join("AB_KEYWORD_ATTRIBUTE", "AB_KEYWORD_ATTRIBUTE.CONTAINER = AB_KEYWORD_ENTRY.CONTAINER")
                         .leftJoin("AB_KEYWORD_ATTRIBUTERELATION", newWhere("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID = AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID")
                                                                     .and("AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID"))
+                        .where("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer)
                         .table();
 
         var res = {};
@@ -97,6 +98,8 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
         }
         return res;
     });
+    
+    return data;
 }
 
 function LanguageData(){}