#22 Modify upload logic, add timestamp filter,