We don't need QueryMatch to be comparable any longer
Refactoring searching so we can handle complex search criteria