Added auto-blocking for the class searching. Now, search of classes occurs in one stream.