Optimize search #493