Search is really working, kind is a TODO