Fixed: SearchAll added with comments