Adding updated search stuff