Fix textfield clear issues