Search optimizations and corrections