Search methods updated