Changed search for assist

Change-Id: Ibab1da70e3496a69b925f13bfa0ea9fac5e3c9dd