Updated Search plugin