Added dummy classes for searches and improved SearchState