Updated search function to be less hacky about how it handles period.
Merged with remote branch