Todola Search changes