Some more fixes in date range picking