diff --git a/taskwiki/viewport.py b/taskwiki/viewport.py
index 0b6a38c..2c5dec8 100644
--- a/taskwiki/viewport.py
+++ b/taskwiki/viewport.py
@@ -104,11 +104,13 @@ class ViewPort(object):
         for token in filter(lambda x: x.isupper(), taskfilter_args):
             if token.startswith('!+'):
                 tokens_to_remove.add(token)
+                tokens_to_remove.add('+' + token[2:])
                 tokens_to_remove.add('-' + token[2:])
                 tokens_to_add.add('+' + token[2:])
             elif token.startswith('!-'):
                 tokens_to_remove.add(token)
                 tokens_to_remove.add('+' + token[2:])
+                tokens_to_remove.add('-' + token[2:])
                 tokens_to_add.add('-' + token[2:])
             elif token.startswith('!?'):
                 tokens_to_remove.add(token)