added search all instructions from #950 and other fixes