Fix overwrite issue
Improve highlighting default input