Removed unused classes, refactored the way any/none works in enums
Added support for future search options