Added some search stuff