Further simplify search