#16 Added diagnose search search