Updated Search Feature