Code search close button issues

[UrtsiSantsi]

There are 2 issues:

1. Closing the code search using the close button doesn't clear the highlights in the code
2. Next time the search is opened it is empty instead of using the last searched word