Added correct search function