Multiple fixes including search box clearence