Added search field #23