Improve a bit on the recent time selection commit