Speedup the search a bit