Proper search implemented