Updated search codebase just to clean it up a bit.