Updated search scripts