Update search & fix some typo