Revert "Revert "Fix clocking to allow again selection of a task in the history""