Cleaning up Search

*Added ability to add countless search fields in the future