Cosmetic changes after working on search