Fixed a few bugs in search and left unused code segments