Improve search field