Fixed clear text input
Added surrogate clear input :beer:
Merge Master