Version push to 2.1.1 and sort by takedate and taketime (that's for you @GustavePate, #98)