diff --git a/artemis_sqlmap/FeaturePub.xml b/artemis_sqlmap/FeaturePub.xml
index daa4a23cea7cf77295497df361724f76b1ef8359..88c93c2c5b6c51615e5a3ea6710b6fce999dd1d0 100644
--- a/artemis_sqlmap/FeaturePub.xml
+++ b/artemis_sqlmap/FeaturePub.xml
@@ -52,8 +52,15 @@
           f.feature_id AS id, pub.*
         FROM feature f
         INNER JOIN feature_pub fpub ON fpub.feature_id = f.feature_id 
-        LEFT JOIN pub               ON fpub.pub_id=pub.pub_id  
-        WHERE f.feature_id = $featureId$
+        LEFT JOIN pub               ON fpub.pub_id=pub.pub_id 
+        <isGreaterThan property="featureId" compareValue="0">
+          WHERE f.feature_id = $featureId$
+        </isGreaterThan>
+		<isEqual property="featureId" compareValue="0">
+	      <isNotNull property="uniqueName"> 
+            WHERE f.uniquename=#uniqueName#
+          </isNotNull>
+	    </isEqual>
      </select>
      
      <insert id="insertFeaturePub" parameterClass="FeaturePub">