Fixing up Not
Adjust OrFilter to use non-reserved words
Fix Query filter
Fix Terms filter
Add Filter method, adjust final query composition accordingly
Adjust FilterWrapper to use OrFilter instead of Or
Adjust tests