Improved search field a little bit