search changes and cosmetic changes