Fixing flicker on search