Changes to make search work with new schemas