Fixed some searching and allow search with timestamps