refactoring + search
name search implemented