Added advanced search for self instruction