Fixed search method and Add timeline method