Modified search code and turned on search...