Refactored search code, added simpleSearch option, and did more refactoring