diff --git a/artemis_sqlmap/Feature.xml b/artemis_sqlmap/Feature.xml
index e010f6fd14b02a41467dfc33c539a0c6a3a3437d..52e62773ea606856467ed39fcc65a0aa031bbeae 100644
--- a/artemis_sqlmap/Feature.xml
+++ b/artemis_sqlmap/Feature.xml
@@ -454,9 +454,10 @@
 	LEFT JOIN feature ON cvterm.cvterm_id=feature.type_id 
 	LEFT JOIN organism ON organism.organism_id=feature.organism_id 
 	WHERE <isNotNull> feature.organism_id=$value$ AND </isNotNull>
+	  residues notnull AND residues != '' AND
 	  ( cvterm.name LIKE '%chromosome%' OR cvterm.name LIKE '%sequence%' OR 
 	    cvterm.name IN ('supercontig', 'ultra_scaffold', 'golden_path_region', 'contig') ) 
-	AND residues notnull AND residues != '' ORDER BY common_name
+	ORDER BY common_name
   </select>
 	
   <select id="getResidueFeaturesByOrganismCommonName" parameterClass="java.lang.String"
@@ -467,9 +468,10 @@
 	LEFT JOIN feature ON cvterm.cvterm_id=feature.type_id 
 	LEFT JOIN organism ON organism.organism_id=feature.organism_id 
 	WHERE <isNotNull> organism.common_name=#value# AND </isNotNull>
+	  residues notnull AND residues != '' AND
 	  ( cvterm.name LIKE '%chromosome%' OR cvterm.name LIKE '%sequence%' OR 
 	    cvterm.name IN ('supercontig', 'ultra_scaffold', 'golden_path_region', 'contig') ) 
-	AND residues notnull AND residues != '' ORDER BY common_name	  
+	ORDER BY common_name	  
   </select>