Updated various cosmetic stuff with search