comment unfinished button, fix search