diff --git a/ippisite/ippidb/views/compound_query.py b/ippisite/ippidb/views/compound_query.py
index b5a6797b0b48fd12e1d38612ee24809442b51323..fc22960e91494410000b931bb64e79264370aea2 100644
--- a/ippisite/ippidb/views/compound_query.py
+++ b/ippisite/ippidb/views/compound_query.py
@@ -195,9 +195,9 @@ class CompoundSimilarityFilterHandler(FilterHandler):
             # FIXME: test if exists before running
             create_tanimoto(query, fingerprint)
             queryset = queryset.filter(compoundtanimoto__canonical_smiles=query, compoundtanimoto__fingerprint=fingerprint).annotate(tanimoto=F('compoundtanimoto__tanimoto'))
-        else:
-            self.filter_context[self.parameter_name+'_fingerprint'] = 'ECFP4'
-            self.filter_context[self.parameter_name+'_query'] = ''
+        #else:
+        #    self.filter_context[self.parameter_name+'_fingerprint'] = 'ECFP4'
+        #    self.filter_context[self.parameter_name+'_query'] = ''
         return queryset
 
     def post_process(self, compound_ids, queryset):
@@ -493,7 +493,7 @@ class CompoundListView(ListView):
         for cfh in cfhs:
             qs = cfh.process(qs)
         # post filter filters
-        if self.filter_context:
+        if {k:v for k,v in self.filter_context.items() if k!='disabled'}:
             # compound ids in the final selection if a selection has happened
             cids = [c for c in qs.all().values_list('id', flat=True)]
         else: