Simplifications to make search faster