UPDATE Search Feature

Major update