Made search faster