Fix flicker. Make search clearer.