Fix search, use klass name