Fixed Search & imroved graph display
Fixed Search & imroved graph display