Fixed search from role to. Some improvements on search