Cleaned up search form.