Changed search function variables