#5 Fixed the issue with quick class search