added search field and combo box