Search on Terms Fixed

It’s in the title
Clean Up

Removing unnecessary comments.