Added working search