Search + little refactor