Fixed name search again