Improved search strategies

Streamlined code where possible.