Search by city state working, clean up code next