#16 Fixed routes. Added diagnose search