diff --git a/artemis_sqlmap/FeatureSynonym.xml b/artemis_sqlmap/FeatureSynonym.xml
index 0c669f60496bd503e595ee9a8f969e7519ee566b..4c51af132a1cf4cfa2bd56053da3b55fa1bd5133 100644
--- a/artemis_sqlmap/FeatureSynonym.xml
+++ b/artemis_sqlmap/FeatureSynonym.xml
@@ -97,8 +97,10 @@
             parameterClass="Synonym">
       SELECT * FROM feature_synonym 
       WHERE
-        synonym_id=(SELECT synonym_id FROM synonym WHERE 
-        name=#name#) AND is_current
+        synonym_id=
+		( SELECT synonym_id FROM synonym WHERE name=#name#
+	      <isNotNull property="cvTerm">  AND type_id=#cvTerm.cvTermId# </isNotNull> )
+		AND is_current
     </select>