added more fields to search bar and commented out a couple of tricky ones