Fix short junk searches
Efficiency improvements