Add proper clear search fix