Optimized search to work 10x faster