better management of preselected dates

Signed-off-by: Ruben Mendez <ruben.mendez@gmail.com>