Rewrote from booleans in grammar to enums. Handling some new type of searches