Changed labels on the search form. It looks weird right now because the order hasn't been fixed, but I'm committing it just so we can move forward...